From e1856a3500276d07293b3cca54071ab286e2b805 Mon Sep 17 00:00:00 2001 From: Vincent A Date: Mon, 9 Sep 2019 23:28:11 +0200 Subject: [PATCH] python3: replace py2 dict.iter* to py3 equivalent in modules --- modules/dailymotion/module.py | 2 +- modules/happn/module.py | 2 +- modules/hds/pages.py | 2 +- modules/lacentrale/browser.py | 2 +- modules/okc/module.py | 2 +- modules/paypal/browser.py | 2 +- modules/phpbb/browser.py | 2 +- modules/radiofrance/module.py | 4 ++-- modules/radiofrance/test.py | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/dailymotion/module.py b/modules/dailymotion/module.py index 01d9c85d54..116c96b168 100644 --- a/modules/dailymotion/module.py +++ b/modules/dailymotion/module.py @@ -45,7 +45,7 @@ class DailymotionModule(Module, CapVideo, CapCollection): u'380': u'380p', u'720': u'720p', u'1080': u'1080p' - }.iteritems())]) + }.items())]) format_choice = [u'm3u8', u'mp4'] diff --git a/modules/happn/module.py b/modules/happn/module.py index c81d30da62..16d7c4052e 100644 --- a/modules/happn/module.py +++ b/modules/happn/module.py @@ -153,7 +153,7 @@ def __init__(self, info): if 'fb' in info: self.set_profile('info', 'facebook', info['fb']['link']) self.set_profile('facebook', 'likes', 'interests', ', '.join(info['fb']['likes'])) - for name, content in info['fb']['infos'].iteritems(): + for name, content in info['fb']['infos'].items(): self.set_profile('facebook', 'infos', name, content) if info.get('twitter_id') is not None: self.set_profile('info', 'twitter', info['twitter_id']) diff --git a/modules/hds/pages.py b/modules/hds/pages.py index 225c5b134d..ddc1b54131 100644 --- a/modules/hds/pages.py +++ b/modules/hds/pages.py @@ -36,7 +36,7 @@ class Author(object): (UNKNOWN, MALE, FEMALE, - TRANSEXUAL) = xrange(4) + TRANSEXUAL) = range(4) def __init__(self, name=None): self.name = name diff --git a/modules/lacentrale/browser.py b/modules/lacentrale/browser.py index 852f039011..ca3db4c51b 100644 --- a/modules/lacentrale/browser.py +++ b/modules/lacentrale/browser.py @@ -32,7 +32,7 @@ class LaCentraleBrowser(PagesBrowser): advert_page = URL('/auto-occasion-annonce-(?P<_id>.*).html', AdvertPage) def iter_prices(self, product): - _request = '&'.join(['%s=%s' % (key, item) for key, item in product._criteria.iteritems()]) + _request = '&'.join(['%s=%s' % (key, item) for key, item in product._criteria.items()]) return self.list_page.go(_request=_request).iter_prices() def get_price(self, _id, obj): diff --git a/modules/okc/module.py b/modules/okc/module.py index 3fd1b3c6ab..2813c7f600 100644 --- a/modules/okc/module.py +++ b/modules/okc/module.py @@ -229,7 +229,7 @@ def fill_contact(self, contact, fields): if 'profile' in fields: contact = self.get_contact(contact) if contact and 'photos' in fields: - for name, photo in contact.photos.iteritems(): + for name, photo in contact.photos.items(): if photo.url and not photo.data: data = self.browser.open(photo.url).content contact.set_photo(name, data=data) diff --git a/modules/paypal/browser.py b/modules/paypal/browser.py index da59fbe01f..a25fda22e5 100644 --- a/modules/paypal/browser.py +++ b/modules/paypal/browser.py @@ -142,7 +142,7 @@ def get_personal_history(self, account): 'endDate': e, } # The response is sometimes not the one we expect. - for i in xrange(3): + for i in range(3): try: self.location( 'https://www.paypal.com/myaccount/activity/filter?%s', diff --git a/modules/phpbb/browser.py b/modules/phpbb/browser.py index 9ba5b0ee70..27ada9278c 100644 --- a/modules/phpbb/browser.py +++ b/modules/phpbb/browser.py @@ -151,7 +151,7 @@ def post_answer(self, forum_id, topic_id, title, content): if topic_id == 0: if not forum_id: forums = self.get_forums() - forums_prompt = 'Forums list:\n%s' % ('\n'.join(['\t- %s' % f for f in forums.itervalues()])) + forums_prompt = 'Forums list:\n%s' % ('\n'.join(['\t- %s' % f for f in forums.values()])) m = re.match('\[(.*)\] (.*)', title or '') if not m: raise CantSendMessage('Please enter a title formatted like that:\n\t"[FORUM] SUBJECT"\n\n%s' % forums_prompt) diff --git a/modules/radiofrance/module.py b/modules/radiofrance/module.py index f35869e457..74edb8cae4 100644 --- a/modules/radiofrance/module.py +++ b/modules/radiofrance/module.py @@ -251,7 +251,7 @@ def iter_resources(self, objs, split_path): yield Collection([split_path[0], u'podcasts'], u'Podcast') elif len(split_path) == 2 and split_path[1] == 'selection': - for _id, item in sorted(self._RADIOS.iteritems()): + for _id, item in sorted(self._RADIOS.items()): if _id == split_path[0]: if 'selection' in self._RADIOS[_id]: selection_url = self._RADIOS[_id]['selection'] @@ -376,7 +376,7 @@ def get_audio(self, _id): return item def iter_radios_search(self, pattern): - for key, radio in self._RADIOS.iteritems(): + for key, radio in self._RADIOS.items(): if pattern.lower() in radio['title'].lower() or pattern.lower() in key.lower(): yield self.get_radio(key) diff --git a/modules/radiofrance/test.py b/modules/radiofrance/test.py index a89144c60e..905a20a0f0 100644 --- a/modules/radiofrance/test.py +++ b/modules/radiofrance/test.py @@ -61,7 +61,7 @@ def test_ls_radios_and_selections(self): self.assertTrue(len(l_sel[0].url) > 0) def test_podcasts(self): - for key, item in self.backend._RADIOS.iteritems(): + for key, item in self.backend._RADIOS.items(): if 'podcast' in item: emissions = list(self.backend.iter_resources(objs=[BaseAudio], split_path=[key, 'podcasts'])) self.assertTrue(len(emissions) > 0) -- GitLab