jenkins-bot has submitted this change and it was merged.
Change subject: Bug 58053 - iter{items,values,keys} -> items(),values(),keys() ......................................................................
Bug 58053 - iter{items,values,keys} -> items(),values(),keys()
Change-Id: I419b2c2622ea017e451c39fd36023bdb18f30fde --- M scripts/category_redirect.py M scripts/interwiki.py M scripts/isbn.py M scripts/redirect.py M scripts/reflinks.py M scripts/template.py M tests/api_tests.py M tests/site_tests.py 8 files changed, 19 insertions(+), 19 deletions(-)
Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index afaff4d..fa7474b 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -209,7 +209,7 @@ return log_text # sort by keys and keep the first (LOG_SIZE-1) values keep = [text for (key, text) in - sorted(log_items.iteritems(), reverse=True)[:LOG_SIZE - 1]] + sorted(log_items.items(), reverse=True)[:LOG_SIZE - 1]] log_text = "\n".join("\n".join(line for line in text) for text in keep) # get permalink to older logs history = self.log_page.getVersionHistory(total=LOG_SIZE) diff --git a/scripts/interwiki.py b/scripts/interwiki.py index 7d5f8a5..d2e56cf 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -761,11 +761,11 @@ """ Yields (Site, number of pages in site) pairs """ - for site, d in self.tree.iteritems(): + for site, d in self.tree.items(): yield site, len(d)
def __iter__(self): - for site, plist in self.tree.iteritems(): + for site, plist in self.tree.items(): for page in plist: yield page
@@ -1520,14 +1520,14 @@ new[site] = [page] # See if new{} contains any problematic values result = {} - for site, pages in new.iteritems(): + for site, pages in new.items(): if len(pages) > 1: errorCount += 1 self.problem(u"Found more than one link for %s" % site)
if not errorCount and not globalvar.select: # no errors, so all lists have only one item - for site, pages in new.iteritems(): + for site, pages in new.items(): result[site] = pages[0] return result
@@ -1542,7 +1542,7 @@ return None
# First loop over the ones that have more solutions - for site, pages in new.iteritems(): + for site, pages in new.items(): if len(pages) > 1: pywikibot.output(u"=" * 30) pywikibot.output(u"Links to %s" % site) @@ -1573,7 +1573,7 @@ # Loop over the ones that have one solution, so are in principle # not a problem. acceptall = False - for site, pages in new.iteritems(): + for site, pages in new.items(): if len(pages) == 1: if not acceptall: pywikibot.output(u"=" * 30) @@ -1700,7 +1700,7 @@ except GiveUpOnPage: break else: - for (site, page) in new.iteritems(): + for (site, page) in new.items(): # edit restriction for some templates on zh-wiki where # interlanguage keys are included by /doc subpage smallWikiAllowed = not (page.site.sitename() == 'wikipedia:zh' @@ -2042,7 +2042,7 @@
""" # use sets because searching an element is faster than in lists - expectedPages = set(new.itervalues()) + expectedPages = set(new.values()) expectedSites = set(new) try: for site in expectedSites - set(updatedSites): @@ -2415,7 +2415,7 @@ reader = warnfile.WarnfileReader(filename) # we won't use removeHints (hints, removeHints) = reader.getHints() - for page, pagelist in hints.iteritems(): + for page, pagelist in hints.items(): # The WarnfileReader gives us a list of pagelinks, but titletranslate.py # expects a list of strings, so we convert it back. # TODO: This is a quite ugly hack, in the future we should maybe make diff --git a/scripts/isbn.py b/scripts/isbn.py index 32d18dd..cd2ddfa 100755 --- a/scripts/isbn.py +++ b/scripts/isbn.py @@ -1208,7 +1208,7 @@ break
# Determine the group - for groupNumber in ranges.iterkeys(): + for groupNumber in ranges.keys(): if rest.startswith(groupNumber): result += groupNumber + '-' rest = rest[len(groupNumber):] diff --git a/scripts/redirect.py b/scripts/redirect.py index 5027ecc..9c96fad 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -304,7 +304,7 @@ elif self.xmlFilename: redict = self.get_redirects_from_dump() num = 0 - for (key, value) in redict.iteritems(): + for (key, value) in redict.items(): num += 1 # check if the value - that is, the redirect target - is a # redirect as well diff --git a/scripts/reflinks.py b/scripts/reflinks.py index ed7466c..e175816 100644 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -349,13 +349,13 @@ id = 1 while self.autogen + str(id) in foundRefNames: id += 1 - for (g, d) in foundRefs.iteritems(): + for (g, d) in foundRefs.items(): if g: group = u"group="%s" " % group else: group = u""
- for (k, v) in d.iteritems(): + for (k, v) in d.items(): if len(v[1]) == 1 and not v[3]: continue name = v[0] @@ -378,7 +378,7 @@ end = end.replace(ref, unnamed) text = header + end
- for (k, v) in namedRepl.iteritems(): + for (k, v) in namedRepl.items(): # TODO : Support ref groups name = v[0] if v[1]: diff --git a/scripts/template.py b/scripts/template.py index 4222f5d..3400c60 100755 --- a/scripts/template.py +++ b/scripts/template.py @@ -244,7 +244,7 @@ replacements = [] exceptions = {} site = pywikibot.getSite() - for old, new in self.templates.iteritems(): + for old, new in self.templates.items(): namespaces = list(site.namespace(10, all=True)) if not site.nocapitalize: pattern = '[' + \ diff --git a/tests/api_tests.py b/tests/api_tests.py index 4437036..f7401f2 100644 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -30,7 +30,7 @@ # req.keys() should contain "action", "foo", "bar", "one" self.assertEqual(len(req.keys()), 4) self.assert_("test" in req.values()) - self.assert_(all(len(item) == 2 for item in req.iteritems())) + self.assert_(all(len(item) == 2 for item in req.items()))
class TestPageGenerator(PywikibotTestCase): diff --git a/tests/site_tests.py b/tests/site_tests.py index b17b274..d62443e 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -111,9 +111,9 @@ self.assertTrue(all(isinstance(key, int) for key in ns)) self.assertTrue(all(isinstance(val, list) - for val in ns.itervalues())) + for val in ns.values())) self.assertTrue(all(isinstance(name, basestring) - for val in ns.itervalues() + for val in ns.values() for name in val)) self.assertTrue(all(isinstance(mysite.namespace(key), basestring) for key in ns))