From cc2019a065b8e076e57225fe7376156c1525722b Mon Sep 17 00:00:00 2001 From: Serghei Mihai Date: Tue, 1 Sep 2015 11:05:12 +0200 Subject: [PATCH 1/4] contrib.teamnet_axel: xml tree building refactored --- passerelle/contrib/teamnet_axel/models.py | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/passerelle/contrib/teamnet_axel/models.py b/passerelle/contrib/teamnet_axel/models.py index f8e5139..59d7b9c 100644 --- a/passerelle/contrib/teamnet_axel/models.py +++ b/passerelle/contrib/teamnet_axel/models.py @@ -100,12 +100,8 @@ class Management(BaseResource): } ''' xml_utilisateur = ET.Element('UTILISATEUR') - xml_login = ET.Element('LOGIN') - xml_login.text = login - xml_utilisateur.append(xml_login) - xml_pwd = ET.Element('PWD') - xml_pwd.text = pwd - xml_utilisateur.append(xml_pwd) + ET.SubElement(xml_utilisateur, 'LOGIN').text = login + ET.SubElement(xml_utilisateur, 'PWD').text = pwd data = self.get_data('ConnexionCompteFamille', xml_utilisateur) data = data.find('PORTAIL/UTILISATEUR') data = soap.xml_to_dict(data) @@ -120,13 +116,9 @@ class Management(BaseResource): def get_famille(self, idfamille, annee=None): xml_famille = ET.Element('FAMILLE') - xml_idfamille = ET.Element('IDFAMILLE') - xml_idfamille.text = idfamille - xml_famille.append(xml_idfamille) + ET.SubElement(xml_famille, 'IDFAMILLE').text = idfamille if annee: - xml_annee = ET.Element('ANNEE') - xml_annee.text = '%s' % annee - xml_famille.append(xml_annee) + ET.SubElement(xml_famille, 'ANNEE').text = annee data = self.get_data('DonneesFamille', xml_famille) xml_individus = data.findall('PORTAIL/INDIVIDUS') if not xml_individus: @@ -145,17 +137,11 @@ class Management(BaseResource): def get_factures(self, regie_id, family_id, months=None): operation = 'FacturesApayerRegie' xml_factures = ET.Element('LISTFACTURE') - regie = ET.Element('IDREGIE') - regie.text = regie_id - famille = ET.Element('IDFAMILLE') - famille.text = family_id - xml_factures.append(regie) - xml_factures.append(famille) + ET.SubElement(xml_factures, 'IDREGIE').text = regie_id + ET.SubElement(xml_factures, 'IDFAMILLE').text = family_id if months: operation = 'HistoriqueFacturesRegie' - months_xml = ET.Element('NBMOIS') - months_xml.text = months - xml_factures.append(months_xml) + ET.SubElement(xml_factures, 'NBMOIS').text = months data = self.get_data(operation, xml_factures) xml_factures = data.findall('PORTAIL/FACTURES') if not xml_factures: -- 2.5.1