diff --git a/modules/canalplus/pages.py b/modules/canalplus/pages.py index 4b305640a07c2999ffe8c5846b0498f0d1459b19..d1739ae02ee02b5612ef99628a9225f952e7336e 100644 --- a/modules/canalplus/pages.py +++ b/modules/canalplus/pages.py @@ -36,8 +36,8 @@ def get_channels(self): Extract all possible channels (paths) from the page """ channels = list() - for elem in self.doc[2].getchildren(): - for e in elem.getchildren(): + for elem in self.doc[2]: + for e in elem: if e.tag == "NOM": fid, name = self._clean_name(e.text) channels.append(Collection([fid], name)) diff --git a/modules/entreparticuliers/pages.py b/modules/entreparticuliers/pages.py index a0748bfca993c11cbf5199e12f43780a166b584a..6208fffece79238f828300b7a1c1bbec806ace87 100644 --- a/modules/entreparticuliers/pages.py +++ b/modules/entreparticuliers/pages.py @@ -97,7 +97,7 @@ class HousingPage(XMLPage): def build_doc(self, content): doc = super(HousingPage, self).build_doc(content).getroot() - for elem in doc.getiterator(): + for elem in doc.iter(): if not hasattr(elem.tag, 'find'): continue i = elem.tag.find('}') diff --git a/modules/genericnewspaper/pages.py b/modules/genericnewspaper/pages.py index 6bd10c1876ae29199b4b351ea06d05a62bb1b48e..bf4a973e69e159ec73cf1269223fb40b10653076 100644 --- a/modules/genericnewspaper/pages.py +++ b/modules/genericnewspaper/pages.py @@ -103,7 +103,7 @@ def get_article(self, _id): return __article def drop_comments(self, base_element): - for comment in base_element.getiterator(Comment): + for comment in base_element.iter(Comment): comment.drop_tree() def try_remove(self, base_element, selector): diff --git a/modules/hds/pages.py b/modules/hds/pages.py index ddc1b541316b9ffe8a60e97027287515a3dc88fc..c1cfac17a4cabac780aa7c290e14c559c7aee280 100644 --- a/modules/hds/pages.py +++ b/modules/hds/pages.py @@ -129,7 +129,7 @@ class get_author(ItemElement): def obj_description(self): description = u'' - for para in self.el.xpath('//td[has-class("t0")]')[0].getchildren(): + for para in self.el.xpath('//td[has-class("t0")]')[0]: if para.tag not in ('b', 'br'): continue if para.text is not None: diff --git a/modules/mareeinfo/pages.py b/modules/mareeinfo/pages.py index 16c3e3399b23a86a18d97d607713203ae5738491..cf1d39e9fa18ebdd1d9943a9764aa8ec4f03e9a0 100644 --- a/modules/mareeinfo/pages.py +++ b/modules/mareeinfo/pages.py @@ -142,7 +142,7 @@ def _create_low_tide(self, gauge_id, AM=True): return tide def _is_low_tide_first(self, jour): - return XPath('//tr[@id="MareeJours_%s"]/td[1]' % jour)(self)[0].getchildren()[0].tag != 'b' + return list(XPath('//tr[@id="MareeJours_%s"]/td[1]' % jour)(self)[0])[0].tag != 'b' def _get_low_tide_value(self, AM=True, jour=0): slow_tide_pos = 1 if self._is_low_tide_first(jour) else 2 diff --git a/modules/redmine/pages/issues.py b/modules/redmine/pages/issues.py index b9394d2ee0a161711d93d20c323d27a6c1d1df55..e4a24a275bb8fdb5ef7d4b78cfe00c1812a22174 100644 --- a/modules/redmine/pages/issues.py +++ b/modules/redmine/pages/issues.py @@ -184,11 +184,11 @@ def iter_issues(self): # No results. return - for tr in issues.getiterator('tr'): + for tr in issues.iter('tr'): if not tr.attrib.get('id', '').startswith('issue-'): continue issue = {'id': tr.attrib['id'].replace('issue-', '')} - for td in tr.getiterator('td'): + for td in tr.iter('td'): field = td.attrib.get('class', '') if field in ('checkbox','todo',''): continue diff --git a/modules/s2e/pages.py b/modules/s2e/pages.py index 0c88fc06ece62f55bceb8bc06917ebc52c816a7b..25d25716989a8a570034f7d3a3b3efb334af465c 100644 --- a/modules/s2e/pages.py +++ b/modules/s2e/pages.py @@ -275,7 +275,7 @@ class AMFHSBCPage(LoggedPage, XMLPage, CodePage): def build_doc(self, content): doc = super(AMFHSBCPage, self).build_doc(content).getroot() # Remove namespaces - for el in doc.getiterator(): + for el in doc.iter(): if not hasattr(el.tag, 'find'): continue i = el.tag.find('}') diff --git a/modules/transilien/pages.py b/modules/transilien/pages.py index 2ded719b854167277719d7fa80126dc8e93f74ac..89188dc2e759fc7fd68ed43ab1833de5064b1097 100644 --- a/modules/transilien/pages.py +++ b/modules/transilien/pages.py @@ -38,7 +38,7 @@ class RoadMapDuration(Duration): class DepartureTypeFilter(Filter): def filter(self, el): result = [] - for img in el[0].getiterator(tag='img'): + for img in el[0].iter(tag='img'): result.append(img.attrib['alt']) return u' '.join(result) diff --git a/weboob/tools/captcha/virtkeyboard.py b/weboob/tools/captcha/virtkeyboard.py index 9091c21cefa729b50353a35913118752271f7771..3db9c9729d9b7d7886059e5dbf7cf75b16a5279f 100644 --- a/weboob/tools/captcha/virtkeyboard.py +++ b/weboob/tools/captcha/virtkeyboard.py @@ -196,7 +196,7 @@ def __init__(self, file, document, img_element, color, map_attr="onclick", conve map = document.find('//map[@name="%s"]' % map_id) coords = {} - for area in map.getiterator("area"): + for area in map.iter("area"): code = area.attrib.get(map_attr) area_coords = [] for coord in area.attrib.get("coords").split(' ')[0].split(','):