jenkins-bot has submitted this change and it was merged.
Change subject: [IMPROV] Explicit division usage ......................................................................
[IMPROV] Explicit division usage
As with Python 3 one slash (/) is always a float division and two are always an integer division. This behaviour is enableable via a __future__ import. This changes all implicit integer divisions to explicit ones and removes all manual float casts.
Change-Id: I3bdb944db4915553e53a9060a9b01b1739fa8807 --- M pywikibot/date.py M scripts/category.py M scripts/clean_sandbox.py M scripts/flickrripper.py M scripts/reflinks.py 5 files changed, 18 insertions(+), 15 deletions(-)
Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
diff --git a/pywikibot/date.py b/pywikibot/date.py index 350bdf7..0fcaa0e 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -11,6 +11,7 @@ # # Distributed under the terms of the MIT license. # +from __future__ import division __version__ = '$Id$' #
@@ -176,7 +177,7 @@
def encDec0(i): # round to the nearest decade, decade starts with a '0'-ending year - return (i/10) * 10 + return (i // 10) * 10
def encDec1(i): @@ -1145,7 +1146,7 @@ 'hu': lambda m: multi(m, [ (lambda v: dh_constVal(v, 1, u'0-s évek'), lambda p: p == 1), (lambda v: dh_decAD(v, u'%d-as évek'), - lambda p: (p % 100 / 10) in (0, 2, 3, 6, 8)), + lambda p: (p % 100 // 10) in (0, 2, 3, 6, 8)), (lambda v: dh_decAD(v, u'%d-es évek'), alwaysTrue)]), 'io': lambda v: dh_decAD(v, u'%da yari'),
@@ -1161,18 +1162,18 @@
# 1970s => 'Decennium 198' (1971-1980) 'la': lambda v: dh(v, u'Decennium %d', - lambda i: encDec1(i)/10 + 1, + lambda i: encDec1(i) // 10 + 1, lambda ii: (ii[0]-1) * 10),
# 1970s => 'XX amžiaus 8-as dešimtmetis' (1971-1980) 'lt': lambda v: dh(v, u'%R amžiaus %d-as dešimtmetis', - lambda i: (encDec1(i)/100 + 1, - encDec1(i) % 100/10 + 1), + lambda i: (encDec1(i) // 100 + 1, + encDec1(i) % 100 // 10 + 1), lambda v: (v[0]-1)*100 + (v[1]-1)*10),
# 1970s => 'Ngahurutanga 198' (1971-1980) 'mi': lambda v: dh(v, u'Ngahurutanga %d', - lambda i: encDec0(i)/10 + 1, + lambda i: encDec0(i) // 10 + 1, lambda ii: (ii[0]-1) * 10),
'mhr': lambda v: dh_decAD(v, u'%d ийла'), @@ -1194,7 +1195,7 @@ lambda i: (encDec0(i), encDec0(i) + 9), decSinglVal), lambda p: p % 100 >= 0 and p % 100 < 20), (lambda v: dh(v, u'Lata %d. %R wieku', - lambda i: (encDec0(i) % 100, encDec0(i)/100 + 1), + lambda i: (encDec0(i) % 100, encDec0(i) // 100 + 1), lambda ii: (ii[1]-1)*100 + ii[0]), alwaysTrue)]), 'pt': lambda v: dh_decAD(v, u'Década de %d'), @@ -1209,7 +1210,7 @@
# 1970 => '70. roky 20. storočia' 'sk': lambda v: dh(v, u'%d. roky %d. storočia', - lambda i: (encDec0(i) % 100, encDec0(i)/100 + 1), + lambda i: (encDec0(i) % 100, encDec0(i) // 100 + 1), lambda ii: (ii[1]-1) * 100 + ii[0]),
'sl': lambda v: dh_decAD(v, u'%d.'), @@ -1254,7 +1255,7 @@ (lambda v: dh_constVal(v, 0, u'i. e. 0-s évek'), lambda p: p == 0), (lambda v: dh_decBC(v, u'i. e. %d-as évek'), - lambda p: (p % 100 / 10) in (0, 2, 3, 6, 8)), + lambda p: (p % 100 // 10) in (0, 2, 3, 6, 8)), (lambda v: dh_decBC(v, u'i. e. %d-es évek'), alwaysTrue)]), 'it': lambda v: dh_decBC(v, u'Anni %d a.C.'), 'ka': lambda v: dh_decBC(v, u'ძვ. წ. %d-ები'), @@ -1518,14 +1519,14 @@ 'cs': lambda v: dh_centuryAD(v, u'%d. století'), 'da': lambda v: dh_centuryAD(v, u'%d. århundrede'), 'no': lambda v: dh(v, u'%d-tallet', - lambda i: (i-1) * 100, lambda ii: ii[0]/100 + 1), + lambda i: (i-1) * 100, lambda ii: ii[0] // 100 + 1), },
'CenturyBC_Cat': { 'cs': lambda v: dh_centuryBC(v, u'%d. století př. n. l.'), 'de': lambda v: dh_centuryBC(v, u'Jahr (%d. Jh. v. Chr.)'), 'no': lambda v: dh(v, u'%d-tallet f.Kr.', - lambda i: (i-1) * 100, lambda ii: ii[0]/100 + 1), + lambda i: (i-1) * 100, lambda ii: ii[0] // 100 + 1), },
'MillenniumAD': { diff --git a/scripts/category.py b/scripts/category.py index 58df1b6..672b591 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -980,7 +980,7 @@ result += u' ' result += cat.title(asLink=True, textlink=True, withNamespace=False) result += ' (%d)' % cat.categoryinfo['pages'] - if currentDepth < self.maxDepth / 2: + if currentDepth < self.maxDepth // 2: # noisy dots pywikibot.output('.', newline=False) # Find out which other cats are supercats of the current cat diff --git a/scripts/clean_sandbox.py b/scripts/clean_sandbox.py index 09503eb..bf43e9b 100755 --- a/scripts/clean_sandbox.py +++ b/scripts/clean_sandbox.py @@ -45,6 +45,7 @@ # # Distributed under the terms of the MIT license. # +from __future__ import division __version__ = '$Id$' #
@@ -253,7 +254,7 @@ u'Sandbox edited %.1f minutes ago...' % (edit_delta.seconds / 60.0)) pywikibot.output(u'Sleeping for %d minutes.' - % (delta.seconds / 60)) + % (delta.seconds // 60)) time.sleep(delta.seconds) wait = True except pywikibot.EditConflict: diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py index cad7b1d..9407fde 100644 --- a/scripts/flickrripper.py +++ b/scripts/flickrripper.py @@ -211,7 +211,7 @@ descBytes = len(description.encode('utf-8')) if descBytes > maxBytes: # maybe we cut more than needed, anyway we do it - items = max(min(len(description), maxBytes / 4), + items = max(min(len(description), maxBytes // 4), len(description) - descBytes + maxBytes) description = description[:items] title = cleanUpTitle(description) diff --git a/scripts/reflinks.py b/scripts/reflinks.py index b377d20..ed7df9e 100644 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -41,6 +41,7 @@ # # Distributed under the terms of the MIT license. # +from __future__ import division __version__ = '$Id$' #
@@ -286,7 +287,7 @@ nb_letter += 1 if letter.isdigit(): return - if float(nb_upper) / (nb_letter + 1) > .70: + if nb_upper / (nb_letter + 1) > .70: self.title = self.title.title()