jenkins-bot has submitted this change and it was merged.
Change subject: Change all xrange -> range
......................................................................
Change all xrange -> range
Change-Id: Ia890abf36debc950180a1da753c6795c885a7e1d
---
M pywikibot/date.py
M pywikibot/page.py
M pywikibot/pagegenerators.py
M pywikibot/userinterfaces/terminal_interface_base.py
M pywikibot/userinterfaces/win32_unicode.py
M pywikibot/version.py
M scripts/claimit.py
M scripts/cosmetic_changes.py
M scripts/harvest_template.py
M scripts/interwiki.py
M scripts/replace.py
M tests/site_tests.py
12 files changed, 40 insertions(+), 40 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/date.py b/pywikibot/date.py
index 6b2e59e..1982449 100644
--- a/pywikibot/date.py
+++ b/pywikibot/date.py
@@ -229,28 +229,28 @@
# Helper for KN: digits representation
_knDigits = u'೦೧೨೩೪೫೬೭೮೯'
-_knDigitsToLocal = dict([(ord(unicode(i)), _knDigits[i]) for i in xrange(10)])
-_knLocalToDigits = dict([(ord(_knDigits[i]), unicode(i)) for i in xrange(10)])
+_knDigitsToLocal = dict([(ord(unicode(i)), _knDigits[i]) for i in range(10)])
+_knLocalToDigits = dict([(ord(_knDigits[i]), unicode(i)) for i in range(10)])
# Helper for Urdu/Persian languages
_faDigits = u'۰۱۲۳۴۵۶۷۸۹'
-_faDigitsToLocal = dict([(ord(unicode(i)), _faDigits[i]) for i in xrange(10)])
-_faLocalToDigits = dict([(ord(_faDigits[i]), unicode(i)) for i in xrange(10)])
+_faDigitsToLocal = dict([(ord(unicode(i)), _faDigits[i]) for i in range(10)])
+_faLocalToDigits = dict([(ord(_faDigits[i]), unicode(i)) for i in range(10)])
# Helper for HI:, MR:
_hiDigits = u'०१२३४५६७८९'
-_hiDigitsToLocal = dict([(ord(unicode(i)), _hiDigits[i]) for i in xrange(10)])
-_hiLocalToDigits = dict([(ord(_hiDigits[i]), unicode(i)) for i in xrange(10)])
+_hiDigitsToLocal = dict([(ord(unicode(i)), _hiDigits[i]) for i in range(10)])
+_hiLocalToDigits = dict([(ord(_hiDigits[i]), unicode(i)) for i in range(10)])
# Helper for BN:
_bnDigits = u'০১২৩৪৫৬৭৮৯'
-_bnDigitsToLocal = dict([(ord(unicode(i)), _bnDigits[i]) for i in xrange(10)])
-_bnLocalToDigits = dict([(ord(_bnDigits[i]), unicode(i)) for i in xrange(10)])
+_bnDigitsToLocal = dict([(ord(unicode(i)), _bnDigits[i]) for i in range(10)])
+_bnLocalToDigits = dict([(ord(_bnDigits[i]), unicode(i)) for i in range(10)])
# Helper for GU:
_guDigits = u'૦૧૨૩૪૫૬૭૮૯'
-_guDigitsToLocal = dict([(ord(unicode(i)), _guDigits[i]) for i in xrange(10)])
-_guLocalToDigits = dict([(ord(_guDigits[i]), unicode(i)) for i in xrange(10)])
+_guDigitsToLocal = dict([(ord(unicode(i)), _guDigits[i]) for i in range(10)])
+_guLocalToDigits = dict([(ord(_guDigits[i]), unicode(i)) for i in range(10)])
def intToLocalDigitsStr(value, digitsToLocalDict):
@@ -410,7 +410,7 @@
if m:
# decode each found value using provided decoder
values = [decoders[i][2](m.group(i + 1))
- for i in xrange(len(decoders))]
+ for i in range(len(decoders))]
decValue = decf(values)
if isinstance(decValue, basestring):
@@ -438,7 +438,7 @@
% (len(params), len(decoders)))
# convert integer parameters into their textual representation
params = [MakeParameter(decoders[i], params[i])
- for i in xrange(len(params))]
+ for i in range(len(params))]
return strPattern % tuple(params)
else:
if 1 != len(decoders):
@@ -1928,7 +1928,7 @@
if len(patterns) != 12:
raise AssertionError(u'pattern %s does not have 12 elements' % lang)
- for i in xrange(12):
+ for i in range(12):
if patterns[i] is not None:
if isMnthOfYear:
formats[yrMnthFmts[i]][lang] = eval(
@@ -1943,7 +1943,7 @@
def makeMonthList(pattern):
- return [pattern % m for m in xrange(1, 13)]
+ return [pattern % m for m in range(1, 13)]
def makeMonthNamedList(lang, pattern, makeUpperCase=None):
@@ -1960,7 +1960,7 @@
f = lambda s: s[0].upper() + s[1:]
else:
f = lambda s: s[0].lower() + s[1:]
- return [pattern % f(monthName(lang, m)) for m in xrange(1, 13)]
+ return [pattern % f(monthName(lang, m)) for m in range(1, 13)]
#
# Add day of the month formats to the formatting table: "en:May 15"
@@ -2165,7 +2165,7 @@
# Brazil uses "1añ" for the 1st of every month, and number without suffix for
# all other days
brMonthNames = makeMonthNamedList('br', u"%s", True)
-for i in xrange(0, 12):
+for i in range(0, 12):
formats[dayMnthFmts[i]]['br'] = eval(
(u'lambda m: multi(m, [' +
u'(lambda v: dh_dayOfMnth(v, u"%%dañ %s"), lambda p: p == 1),'
+
@@ -2195,7 +2195,7 @@
u"Décembre %d"])
addFmt2('he', True, u"%s %%d", True)
addFmt2('it', True, u"Attualità/Anno %%d - %s", True)
-addFmt ('ja', True, [u"「最近の出来事」%%d年%d月" % mm for mm in xrange(1, 13)])
+addFmt ('ja', True, [u"「最近の出来事」%%d年%d月" % mm for mm in range(1, 13)])
addFmt2('ka', True, u"%s, %%d")
addFmt ('ko', True, [u"%d년 1월", u"%d년 2월", u"%d년
3월", u"%d년 4월",
u"%d년 5월", u"%d년 6월", u"%d년 7월",
u"%d년 8월",
@@ -2260,7 +2260,7 @@
_formatLimit_DayOfMonth31 = (lambda v: 1 <= v and v < 32, 1, 32)
_formatLimit_DayOfMonth30 = (lambda v: 1 <= v and v < 31, 1, 31)
_formatLimit_DayOfMonth29 = (lambda v: 1 <= v and v < 30, 1, 30)
-for monthId in xrange(12):
+for monthId in range(12):
if (monthId + 1) in (1, 3, 5, 7, 8, 10, 12):
# 31 days a month
formatLimits[dayMnthFmts[monthId]] = _formatLimit_DayOfMonth31
@@ -2355,7 +2355,7 @@
for code, convFunc in formats[formatName].items():
## import time
## startClock = time.clock()
- for value in xrange(start, stop, step):
+ for value in range(start, stop, step):
try:
if not predicate(value):
raise AssertionError(
diff --git a/pywikibot/page.py b/pywikibot/page.py
index c5636bf..0de6559 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -1090,7 +1090,7 @@
intkeys[int(key)] = args[key]
except ValueError:
named[key] = args[key]
- for i in xrange(1, len(intkeys) + 1):
+ for i in range(1, len(intkeys) + 1):
# only those args with consecutive integer keys can be
# treated as positional; an integer could also be used
# (out of order) as the key for a named argument
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index baccca5..9580ec3 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -206,7 +206,7 @@
Only call this after all arguments have been parsed.
"""
namespaces = [int(n) for n in self.namespaces]
- for i in xrange(len(self.gens)):
+ for i in range(len(self.gens)):
if isinstance(self.gens[i], pywikibot.data.api.QueryGenerator):
if self.namespaces:
self.gens[i].set_namespace(namespaces)
@@ -768,7 +768,7 @@
if site is None:
site = pywikibot.Site()
# convert namespace names to namespace numbers
- for i in xrange(len(namespaces)):
+ for i in range(len(namespaces)):
ns = namespaces[i]
if isinstance(ns, basestring):
try:
@@ -1275,7 +1275,7 @@
if site is None:
site = pywikibot.Site()
pywikibot.output(u"Starting with year %i" % start)
- for i in xrange(start, end + 1):
+ for i in range(start, end + 1):
if i % 100 == 0:
pywikibot.output(u'Preparing %i...' % i)
# There is no year 0
@@ -1290,8 +1290,8 @@
fd = date.FormatDate(site)
firstPage = pywikibot.Page(site, fd(startMonth, 1))
pywikibot.output(u"Starting with %s" % firstPage.title(asLink=True))
- for month in xrange(startMonth, endMonth + 1):
- for day in xrange(1, date.getNumberOfDaysInMonth(month) + 1):
+ for month in range(startMonth, endMonth + 1):
+ for day in range(1, date.getNumberOfDaysInMonth(month) + 1):
yield pywikibot.Page(pywikibot.Link(fd(month, day), site))
if __name__ == "__main__":
diff --git a/pywikibot/userinterfaces/terminal_interface_base.py
b/pywikibot/userinterfaces/terminal_interface_base.py
index a5d6ecb..28f3221 100755
--- a/pywikibot/userinterfaces/terminal_interface_base.py
+++ b/pywikibot/userinterfaces/terminal_interface_base.py
@@ -135,7 +135,7 @@
# Note: A transliteration replacement might be longer than the
# original character, e.g. ч is transliterated to ch.
prev = "-"
- for i in xrange(len(codecedText)):
+ for i in range(len(codecedText)):
# work on characters that couldn't be encoded, but not on
# original question marks.
if codecedText[i] == '?' and text[i] != u'?':
diff --git a/pywikibot/userinterfaces/win32_unicode.py
b/pywikibot/userinterfaces/win32_unicode.py
index 97a611a..c34a6b1 100755
--- a/pywikibot/userinterfaces/win32_unicode.py
+++ b/pywikibot/userinterfaces/win32_unicode.py
@@ -235,7 +235,7 @@
argc = c_int(0)
argv_unicode = CommandLineToArgvW(GetCommandLineW(), byref(argc))
- argv = [argv_unicode[i].encode('utf-8') for i in xrange(0, argc.value)]
+ argv = [argv_unicode[i].encode('utf-8') for i in range(0, argc.value)]
if not hasattr(sys, 'frozen'):
# If this is an executable produced by py2exe or bbfreeze, then it will
diff --git a/pywikibot/version.py b/pywikibot/version.py
index 5e3fc9d..6dd9514 100644
--- a/pywikibot/version.py
+++ b/pywikibot/version.py
@@ -94,13 +94,13 @@
tag = tag[:-len(name)]
date = time.gmtime(date / 1000000)
else:
- for i in xrange(3):
+ for i in range(3):
entries.readline()
tag = entries.readline().strip()
t = tag.split('://')
t[1] =
t[1].replace('svn.wikimedia.org/svnroot/pywikipedia/'ia/',
'')
tag = '[%s] %s' % (t[0], t[1])
- for i in xrange(4):
+ for i in range(4):
entries.readline()
date = time.strptime(entries.readline()[:19], '%Y-%m-%dT%H:%M:%S')
rev = entries.readline()[:-1]
diff --git a/scripts/claimit.py b/scripts/claimit.py
index 9d42a7f..db8ff17 100755
--- a/scripts/claimit.py
+++ b/scripts/claimit.py
@@ -187,7 +187,7 @@
claims = list()
repo = pywikibot.Site().data_repository()
- for i in xrange(0, len(commandline_claims), 2):
+ for i in range(0, len(commandline_claims), 2):
claim = pywikibot.Claim(repo, commandline_claims[i])
if claim.getType() == 'wikibase-item':
target = pywikibot.ItemPage(repo, commandline_claims[i + 1])
diff --git a/scripts/cosmetic_changes.py b/scripts/cosmetic_changes.py
index d419752..9377964 100755
--- a/scripts/cosmetic_changes.py
+++ b/scripts/cosmetic_changes.py
@@ -350,7 +350,7 @@
# bug #3346901 should be implemented
continue
# lowerspaced and underscored namespaces
- for i in xrange(len(namespaces)):
+ for i in range(len(namespaces)):
item = namespaces[i].replace(' ', '[ _]')
item = u'[%s%s]' % (item[0], item[0].lower()) + item[1:]
namespaces[i] = item
@@ -765,7 +765,7 @@
return text
# replace persian/arabic digits
## deactivated due to bug #3539407
- for i in xrange(0, 10):
+ for i in range(0, 10):
text = pywikibot.replaceExcept(text, old[i], new[i], exceptions)
# do not change digits in class, style and table params
pattern = re.compile(u'\w+=(".+?"|\d+)', re.UNICODE)
@@ -775,7 +775,7 @@
exceptions.append(pattern)
exceptions.append('table') # exclude tables for now
# replace digits
- for i in xrange(0, 10):
+ for i in range(0, 10):
text = pywikibot.replaceExcept(text, str(i), new[i], exceptions)
return text
diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py
index a0a947f..2507544 100755
--- a/scripts/harvest_template.py
+++ b/scripts/harvest_template.py
@@ -177,7 +177,7 @@
raise ValueError # or something.
fields = dict()
- for i in xrange(0, len(commandline_arguments), 2):
+ for i in range(0, len(commandline_arguments), 2):
fields[commandline_arguments[i]] = commandline_arguments[i + 1]
generator = gen.getCombinedGenerator()
diff --git a/scripts/interwiki.py b/scripts/interwiki.py
index d8764bb..7d5f8a5 100755
--- a/scripts/interwiki.py
+++ b/scripts/interwiki.py
@@ -2147,7 +2147,7 @@
% fs.originPage)
pywikibot.output(u"NOTE: Number of pages queued is %d, trying to add %d
more."
% (len(self.subjects), number))
- for i in xrange(number):
+ for i in range(number):
try:
while True:
try:
@@ -2306,7 +2306,7 @@
def queryStep(self):
self.oneQuery()
# Delete the ones that are done now.
- for i in xrange(len(self.subjects) - 1, -1, -1):
+ for i in range(len(self.subjects) - 1, -1, -1):
subj = self.subjects[i]
if subj.isDone():
subj.finish()
diff --git a/scripts/replace.py b/scripts/replace.py
index 94a93d6..0be0be8 100755
--- a/scripts/replace.py
+++ b/scripts/replace.py
@@ -556,7 +556,7 @@
)
elif (len(commandline_replacements) > 1):
if (fix is None):
- for i in xrange(0, len(commandline_replacements), 2):
+ for i in range(0, len(commandline_replacements), 2):
replacements.append((commandline_replacements[i],
commandline_replacements[i + 1]))
if not summary_commandline:
diff --git a/tests/site_tests.py b/tests/site_tests.py
index a3f6d81..b17b274 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -105,7 +105,7 @@
for b in builtins))
ns = mysite.namespaces()
self.assertType(ns, dict)
- self.assertTrue(all(x in ns for x in xrange(0, 16)))
+ self.assertTrue(all(x in ns for x in range(0, 16)))
# built-in namespaces always present
self.assertType(mysite.ns_normalize("project"), basestring)
self.assertTrue(all(isinstance(key, int)
@@ -471,7 +471,7 @@
self.assertTrue(prop in block)
# timestamps should be in descending order
timestamps = [block['timestamp'] for block in bl]
- for t in xrange(1, len(timestamps)):
+ for t in range(1, len(timestamps)):
self.assertTrue(timestamps[t] <= timestamps[t - 1])
b2 = list(mysite.blocks(total=10, reverse=True))
@@ -482,7 +482,7 @@
self.assertTrue(prop in block)
# timestamps should be in ascending order
timestamps = [block['timestamp'] for block in b2]
- for t in xrange(1, len(timestamps)):
+ for t in range(1, len(timestamps)):
self.assertTrue(timestamps[t] >= timestamps[t - 1])
for block in mysite.blocks(starttime="2008-07-01T00:00:01Z", total=5):
--
To view, visit
https://gerrit.wikimedia.org/r/98285
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia890abf36debc950180a1da753c6795c885a7e1d
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot