jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/445859 )
Change subject: [IMPR] Use iterated items instead of indexed items
......................................................................
[IMPR] Use iterated items instead of indexed items
- also replace range(0, stop) by range(stop)
- use enumerate function if necessary
Change-Id: Iff3a215182bf528de01ccf58b9a36a208ece092a
---
M pywikibot/cosmetic_changes.py
M pywikibot/date.py
M pywikibot/userinterfaces/terminal_interface_base.py
M scripts/casechecker.py
M scripts/imagetransfer.py
M scripts/match_images.py
6 files changed, 21 insertions(+), 24 deletions(-)
Approvals:
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py
index 7584824..6e3ff66 100755
--- a/pywikibot/cosmetic_changes.py
+++ b/pywikibot/cosmetic_changes.py
@@ -421,8 +421,8 @@
# skip localized user namespace, maybe gender is used
namespaces = ['User' if namespace == 2 else 'User talk']
# lowerspaced and underscored namespaces
- for i in range(len(namespaces)):
- item = namespaces[i].replace(' ', '[ _]')
+ for i, item in enumerate(namespaces):
+ item = item.replace(' ', '[ _]')
item = u'[%s%s]' % (item[0], item[0].lower()) + item[1:]
namespaces[i] = item
namespaces.append(first_lower(final_ns))
diff --git a/pywikibot/date.py b/pywikibot/date.py
index 47e8200..c7a9766 100644
--- a/pywikibot/date.py
+++ b/pywikibot/date.py
@@ -447,8 +447,8 @@
m = compPattern.match(value)
if m:
# decode each found value using provided decoder
- values = [decoders[i][2](m.group(i + 1))
- for i in range(len(decoders))]
+ values = [decoder[2](m.group(i + 1))
+ for i, decoder in enumerate(decoders)]
decValue = decf(values)
assert not isinstance(decValue, basestring), \
@@ -477,8 +477,8 @@
'parameter count ({0}) does not match decoder count ({1})'
.format(len(params), len(decoders)))
# convert integer parameters into their textual representation
- params = [MakeParameter(decoders[i], params[i])
- for i in range(len(params))]
+ params = [MakeParameter(decoders[i], param)
+ for i, param in enumerate(params)]
return strPattern % tuple(params)
else:
assert len(decoders) == 1, (
diff --git a/pywikibot/userinterfaces/terminal_interface_base.py
b/pywikibot/userinterfaces/terminal_interface_base.py
index f68475d..151083f 100755
--- a/pywikibot/userinterfaces/terminal_interface_base.py
+++ b/pywikibot/userinterfaces/terminal_interface_base.py
@@ -210,10 +210,10 @@
# Note: A transliteration replacement might be longer than the
# original character, e.g. ч is transliterated to ch.
prev = "-"
- for i in range(len(codecedText)):
+ for i, char in enumerate(codecedText):
# work on characters that couldn't be encoded, but not on
# original question marks.
- if codecedText[i] == '?' and text[i] != u'?':
+ if char == '?' and text[i] != '?':
try:
transliterated = transliterator.transliterate(
text[i], default='?', prev=prev, next=text[i + 1])
@@ -231,8 +231,8 @@
prev = transliterated[-1]
else:
# no need to try to transliterate.
- transliteratedText += codecedText[i]
- prev = codecedText[i]
+ transliteratedText += char
+ prev = char
text = transliteratedText
if not targetStream:
diff --git a/scripts/casechecker.py b/scripts/casechecker.py
index 792b11b..7986ba4 100755
--- a/scripts/casechecker.py
+++ b/scripts/casechecker.py
@@ -558,7 +558,7 @@
# combinations from the bad words list, and convert just the
# picked words to cyrilic, whereas making all other words as
# latin character.
- for itemCntToPick in xrange(0, len(ambigBadWords) + 1):
+ for itemCntToPick in xrange(len(ambigBadWords) + 1):
title2 = title
for uc in itertools.combinations(list(ambigBadWords),
itemCntToPick):
@@ -771,14 +771,12 @@
if len(frmParts) != len(toParts):
raise ValueError('Splitting parts do not match counts')
- for i in xrange(0, len(frmParts)):
- if len(frmParts[i]) != len(toParts[i]):
+ for i, part in enumerate(frmParts):
+ if part != len(toParts[i]):
raise ValueError('Splitting parts do not match word length')
- if len(frmParts[i]) > 0:
- text = text.replace(first_lower(frmParts[i]),
- first_lower(toParts[i]))
- text = text.replace(first_upper(frmParts[i]),
- first_upper(toParts[i]))
+ if part:
+ text = text.replace(first_lower(part), first_lower(toParts[i]))
+ text = text.replace(first_upper(part), first_upper(toParts[i]))
return text
diff --git a/scripts/imagetransfer.py b/scripts/imagetransfer.py
index 3ffd488..2212055 100755
--- a/scripts/imagetransfer.py
+++ b/scripts/imagetransfer.py
@@ -198,8 +198,7 @@
def showImageList(self, imagelist):
"""Print image list."""
- for i in range(len(imagelist)):
- image = imagelist[i]
+ for i, image in enumerate(imagelist):
pywikibot.output('-' * 60)
pywikibot.output(u"%s. Found image: %s"
% (i, image.title(as_link=True)))
@@ -248,7 +247,7 @@
else:
imagelist = list(page.imagelinks(followRedirects=True))
- while len(imagelist) > 0:
+ while imagelist:
self.showImageList(imagelist)
if len(imagelist) == 1:
# no need to query the user, only one possibility
diff --git a/scripts/match_images.py b/scripts/match_images.py
index b5c8923..59b1c07 100755
--- a/scripts/match_images.py
+++ b/scripts/match_images.py
@@ -128,9 +128,9 @@
if len(histogramA) != len(histogramB):
return 0
- for i in range(0, len(histogramA)):
- totalMatch = totalMatch + min(histogramA[i], histogramB[i])
- totalPixels = totalPixels + max(histogramA[i], histogramB[i])
+ for i, hist_a in enumerate(histogramA):
+ totalMatch = totalMatch + min(hist_a, histogramB[i])
+ totalPixels = totalPixels + max(hist_a, histogramB[i])
if totalPixels == 0:
return 0
--
To view, visit
https://gerrit.wikimedia.org/r/445859
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff3a215182bf528de01ccf58b9a36a208ece092a
Gerrit-Change-Number: 445859
Gerrit-PatchSet: 5
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot