Python 3 preparation: use // and __truediv__ as needed.

Tool-assisted patch.  Those divisions that I thought must be integer
floor divisions and rely on Python 2 integer floor division semantics
are changed to use // (if any are actually meant to be floating-point
divisions, that would break things).  One __div__ method is changed to
__truediv__ (with __div__ = __truediv__ for Python 2 compatibility).

Author: jsm28

roundup/backends/blobfiles.py

@@ -221,7 +221,7 @@ def subdirFilename(self, classname, nodeid, property=None):
             name = '%s%s'%(classname, nodeid)
 
         # have a separate subdir for every thousand messages
-        subdir = str(int(nodeid) / 1000)
+        subdir = str(int(nodeid) // 1000)
         return os.path.join(subdir, name)
 
     def _tempfile(self, filename):

roundup/cgi/TAL/TALInterpreter.py

@@ -277,7 +277,7 @@ def do_startTag(self, name_attrList,
         col = self.col + _len(name) + 1
         wrap = self.wrap
         align = col + 1
-        if align >= wrap/2:
+        if align >= wrap//2:
             align = 4  # Avoid a narrow column far to the right
         attrAction = self.dispatch["<attrAction>"]
         try:

roundup/date.py

@@ -564,9 +564,9 @@ def dateDelta(self, other):
             sign = -1
             diff = -diff
         S = diff%60
-        M = (diff/60)%60
-        H = (diff/(60*60))%24
-        d = diff/(24*60*60)
+        M = (diff//60)%60
+        H = (diff//(60*60))%24
+        d = diff//(24*60*60)
         return Interval((0, 0, d, H, M, S), sign=sign,
             translator=self.translator)
 
@@ -895,7 +895,7 @@ def __sub__(self, other):
         # nope, no idea what to do with this other...
         raise TypeError("Can't add %r"%other)
 
-    def __div__(self, other):
+    def __truediv__(self, other):
         """ Divide this interval by an int value.
 
             Can't divide years and months sensibly in the _same_
@@ -918,7 +918,7 @@ def __div__(self, other):
 
             sign = months<0 and -1 or 1
             m = months%12
-            y = months / 12
+            y = months // 12
             return Interval((sign, y, m, 0, 0, 0, 0),
                 translator=self.translator)
 
@@ -932,21 +932,23 @@ def __div__(self, other):
             sign = seconds<0 and -1 or 1
             seconds *= sign
             S = seconds%60
-            seconds /= 60
+            seconds //= 60
             M = seconds%60
-            seconds /= 60
+            seconds //= 60
             H = seconds%24
-            d = seconds / 24
+            d = seconds // 24
             return Interval((sign, 0, 0, d, H, M, S),
                 translator=self.translator)
+    # Python 2 compatibility:
+    __div__ = __truediv__
 
     def __repr__(self):
         return '<Interval %s>'%self.__str__()
 
     def pretty(self):
         ''' print up the date date using one of these nice formats..
         '''
-        _quarters = self.minute / 15
+        _quarters = self.minute // 15
         if self.year:
             s = self.ngettext("%(number)s year", "%(number)s years",
                 self.year) % {'number': self.year}
@@ -1040,11 +1042,11 @@ def from_seconds(self, val):
         else:
             self.sign = 1
         self.second = val % 60
-        val = val / 60
+        val = val // 60
         self.minute = val % 60
-        val = val / 60
+        val = val // 60
         self.hour = val % 24
-        val = val / 24
+        val = val // 24
         self.day = val
         self.month = self.year = 0
 
@@ -1079,17 +1081,17 @@ def fixTimeOverflow(time):
         sign = seconds<0 and -1 or 1
         seconds *= sign
         S = seconds%60
-        seconds /= 60
+        seconds //= 60
         M = seconds%60
-        seconds /= 60
+        seconds //= 60
         H = seconds%24
-        d = seconds / 24
+        d = seconds // 24
     else:
         months = y*12 + m
         sign = months<0 and -1 or 1
         months *= sign
         m = months%12
-        y = months/12
+        y = months//12
 
     return (sign, y, m, d, H, M, S)
 

roundup/support.py

@@ -70,7 +70,7 @@ def __init__(self, info, sequence):
         self.total = len(sequence)
         self.start = self.now = time.time()
         self.num = 0
-        self.stepsize = self.total / 100 or 1
+        self.stepsize = self.total // 100 or 1
         self.steptimes = []
         self.display()
 

test/benchmark.py

@@ -53,8 +53,8 @@ def main(backendname, time=time.time, numissues=10):
                 db.issue.set(str(i+1), status='2', assignedto='2', nosy=[])
                 db.issue.set(str(i+1), status='1', assignedto='1',
                     nosy=['1','2'])
-            if (i*100/numissues) != pc:
-                pc = (i*100/numissues)
+            if (i*100//numissues) != pc:
+                pc = (i*100//numissues)
                 sys.stdout.write("%d%%\r"%pc)
                 sys.stdout.flush()
             db.commit()

test/test_multipart.py

@@ -71,7 +71,7 @@ def getIndent(self, line):
             if char != ' ':
                 break
             count += 1
-        return count / 4
+        return count // 4
 
 class MultipartTestCase(unittest.TestCase):
     def setUp(self):

tools/load_tracker.py

@@ -57,14 +57,14 @@
         db.user.lookup('alpha0')
     except:
         # add some users
-        M = N/100
+        M = N//100
         for i in range(M):
             print('\ruser', i, '       ', end=' ')
             sys.stdout.flush()
-            if i/17 == 0:
+            if i//17 == 0:
                 db.user.create(username=names[i%17])
             else:
-                db.user.create(username=names[i%17]+str(i/17))
+                db.user.create(username=names[i%17]+str(i//17))
 
     # assignable user list
     users = db.user.list()