The first batch of changes recommended by the fixdiv tool. These are

mostly changes of / operators into //.  Once or twice I did more or
less than recommended.

diff --git a/Lib/base64.py b/Lib/base64.py
index 44cd03a20fcdf8f169187760abe4bc9e489213fc..3158fdcee251925fc954cc271aa54d728f170786 100755 (executable)
--- a/Lib/base64.py
+++ b/Lib/base64.py
@@ -9,7 +9,7 @@ import binascii
 __all__ = ["encode","decode","encodestring","decodestring"]
 
 MAXLINESIZE = 76 # Excluding the CRLF
-MAXBINSIZE = (MAXLINESIZE/4)*3
+MAXBINSIZE = (MAXLINESIZE//4)*3
 
 def encode(input, output):
     """Encode a file."""

diff --git a/Lib/binhex.py b/Lib/binhex.py
index 686f8d9a8b9da4374aa49c0542cd5917d887bd3c..5700659bf7c73730356e6e985dbb552ad49352d1 100644 (file)
--- a/Lib/binhex.py
+++ b/Lib/binhex.py
@@ -128,7 +128,7 @@ class _Hqxcoderengine:
     def write(self, data):
         self.data = self.data + data
         datalen = len(self.data)
-        todo = (datalen/3)*3
+        todo = (datalen//3)*3
         data = self.data[:todo]
         self.data = self.data[todo:]
         if not data:
@@ -292,7 +292,7 @@ class _Hqxdecoderengine:
         # much to decode: there may be newlines in the incoming data.
         while wtd > 0:
             if self.eof: return decdata
-            wtd = ((wtd+2)/3)*4
+            wtd = ((wtd+2)//3)*4
             data = self.ifp.read(wtd)
             #
             # Next problem: there may not be a complete number of

diff --git a/Lib/bisect.py b/Lib/bisect.py
index d311337271e56521a34ea2f6f53006c2220ee62f..c9e6c60cd376be72b3693f59747f5d2460c11095 100644 (file)
--- a/Lib/bisect.py
+++ b/Lib/bisect.py
@@ -12,7 +12,7 @@ def insort_right(a, x, lo=0, hi=None):
     if hi is None:
         hi = len(a)
     while lo < hi:
-        mid = (lo+hi)/2
+        mid = (lo+hi)//2
         if x < a[mid]: hi = mid
         else: lo = mid+1
     a.insert(lo, x)
@@ -33,7 +33,7 @@ def bisect_right(a, x, lo=0, hi=None):
     if hi is None:
         hi = len(a)
     while lo < hi:
-        mid = (lo+hi)/2
+        mid = (lo+hi)//2
         if x < a[mid]: hi = mid
         else: lo = mid+1
     return lo
@@ -52,7 +52,7 @@ def insort_left(a, x, lo=0, hi=None):
     if hi is None:
         hi = len(a)
     while lo < hi:
-        mid = (lo+hi)/2
+        mid = (lo+hi)//2
         if a[mid] < x: lo = mid+1
         else: hi = mid
     a.insert(lo, x)
@@ -72,7 +72,7 @@ def bisect_left(a, x, lo=0, hi=None):
     if hi is None:
         hi = len(a)
     while lo < hi:
-        mid = (lo+hi)/2
+        mid = (lo+hi)//2
         if a[mid] < x: lo = mid+1
         else: hi = mid
     return lo

diff --git a/Lib/dumbdbm.py b/Lib/dumbdbm.py
index e5083492e3a10e49524c7b14b401f8658e499b4d..287a8a0c1b9a5e3c575c8ef509c9b5eba5226367 100644 (file)
--- a/Lib/dumbdbm.py
+++ b/Lib/dumbdbm.py
@@ -87,7 +87,7 @@ class _Database:
 ## Does not work under MW compiler
 ##              pos = ((pos + _BLOCKSIZE - 1) / _BLOCKSIZE) * _BLOCKSIZE
 ##              f.seek(pos)
-        npos = ((pos + _BLOCKSIZE - 1) / _BLOCKSIZE) * _BLOCKSIZE
+        npos = ((pos + _BLOCKSIZE - 1) // _BLOCKSIZE) * _BLOCKSIZE
         f.write('\0'*(npos-pos))
         pos = npos
 

diff --git a/Lib/inspect.py b/Lib/inspect.py
index 6183b0ee5b5112241c402cca75046ffce9efcdee..f57ba374e6996cfb4b3c64607026ba043bad0b44 100644 (file)
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -590,7 +590,7 @@ def getframeinfo(frame, context=1):
     filename = getsourcefile(frame)
     lineno = getlineno(frame)
     if context > 0:
-        start = lineno - 1 - context/2
+        start = lineno - 1 - context//2
         try:
             lines, lnum = findsource(frame)
         except IOError:

diff --git a/Lib/quopri.py b/Lib/quopri.py
index 575fcd11fb4b1b2c0e7831080bd8e1add49bf87a..f668abf3e191df808eaf4994582e60fea62a678d 100755 (executable)
--- a/Lib/quopri.py
+++ b/Lib/quopri.py
@@ -27,7 +27,7 @@ def needsquoting(c, quotetabs):
 def quote(c):
     """Quote a single character."""
     i = ord(c)
-    return ESCAPE + HEX[i/16] + HEX[i%16]
+    return ESCAPE + HEX[i//16] + HEX[i%16]
 
 
 

diff --git a/Lib/repr.py b/Lib/repr.py
index f418d1a5f60d92ca56ad49258c37b99d5e5d87fb..1b1f4f46898dc47a6065ec01b09d0f790f370580 100644 (file)
--- a/Lib/repr.py
+++ b/Lib/repr.py
@@ -65,7 +65,7 @@ class Repr:
     def repr_str(self, x, level):
         s = `x[:self.maxstring]`
         if len(s) > self.maxstring:
-            i = max(0, (self.maxstring-3)/2)
+            i = max(0, (self.maxstring-3)//2)
             j = max(0, self.maxstring-3-i)
             s = `x[:i] + x[len(x)-j:]`
             s = s[:i] + '...' + s[len(s)-j:]
@@ -73,7 +73,7 @@ class Repr:
     def repr_long(self, x, level):
         s = `x` # XXX Hope this isn't too slow...
         if len(s) > self.maxlong:
-            i = max(0, (self.maxlong-3)/2)
+            i = max(0, (self.maxlong-3)//2)
             j = max(0, self.maxlong-3-i)
             s = s[:i] + '...' + s[len(s)-j:]
         return s
@@ -86,7 +86,7 @@ class Repr:
             return '<' + x.__class__.__name__ + ' instance at ' + \
                       hex(id(x))[2:] + '>'
         if len(s) > self.maxstring:
-            i = max(0, (self.maxstring-3)/2)
+            i = max(0, (self.maxstring-3)//2)
             j = max(0, self.maxstring-3-i)
             s = s[:i] + '...' + s[len(s)-j:]
         return s

diff --git a/Lib/rfc822.py b/Lib/rfc822.py
index b3f7fb2274f79852a481bd6c9e5f16b830ec1e76..430e6372f0fd53965fe56c482a5e1cc31033788e 100644 (file)
--- a/Lib/rfc822.py
+++ b/Lib/rfc822.py
@@ -927,7 +927,7 @@ def parsedate_tz(data):
             tzoffset = -tzoffset
         else:
             tzsign = 1
-        tzoffset = tzsign * ( (tzoffset/100)*3600 + (tzoffset % 100)*60)
+        tzoffset = tzsign * ( (tzoffset//100)*3600 + (tzoffset % 100)*60)
     tuple = (yy, mm, dd, thh, tmm, tss, 0, 0, 0, tzoffset)
     return tuple
 

diff --git a/Lib/test/test_audioop.py b/Lib/test/test_audioop.py
index 495a918b699e041e31c4cf4247405a8ceb29e80a..a4e191497b57649d47f8ac6fe28a22c12c0e42da 100644 (file)
--- a/Lib/test/test_audioop.py
+++ b/Lib/test/test_audioop.py
@@ -116,8 +116,8 @@ def testlin2lin(data):
     # too simple: we test only the size
     for d1 in data:
         for d2 in data:
-            got = len(d1)/3
-            wtd = len(d2)/3
+            got = len(d1)//3
+            wtd = len(d2)//3
             if len(audioop.lin2lin(d1, got, wtd)) != len(d2):
                 return 0
     return 1

diff --git a/Lib/test/test_augassign.py b/Lib/test/test_augassign.py
index e9e5b238649b5a5a40c12f77eb26f6681e090e6e..c372b9a695acc2715f0045ca58bd8a1502c4a65e 100644 (file)
--- a/Lib/test/test_augassign.py
+++ b/Lib/test/test_augassign.py
@@ -5,7 +5,7 @@ x += 1
 x *= 2
 x **= 2
 x -= 8
-x /= 2
+x //= 2
 x //= 1
 x %= 12
 x &= 2
@@ -19,7 +19,7 @@ x[0] += 1
 x[0] *= 2
 x[0] **= 2
 x[0] -= 8
-x[0] /= 2
+x[0] //= 2
 x[0] //= 2
 x[0] %= 12
 x[0] &= 2
@@ -33,7 +33,7 @@ x[0] += 1
 x[0] *= 2
 x[0] **= 2
 x[0] -= 8
-x[0] /= 2
+x[0] //= 2
 x[0] //= 1
 x[0] %= 12
 x[0] &= 2

diff --git a/Lib/test/test_b1.py b/Lib/test/test_b1.py
index 46a6da0bc75370e6b5a0794ee83a4f7792805a37..978f67400c3e206945bcea2a444d1b6e06b2e862 100644 (file)
--- a/Lib/test/test_b1.py
+++ b/Lib/test/test_b1.py
@@ -413,7 +413,7 @@ else:
 # Worked by accident in Windows release build, but failed in debug build.
 # Failed in all Linux builds.
 x = -1-sys.maxint
-if x >> 1 != x/2:
+if x >> 1 != x//2:
     raise TestFailed("x >> 1 != x/2 when x == -1-sys.maxint")
 
 print 'isinstance'

diff --git a/Lib/test/test_binascii.py b/Lib/test/test_binascii.py
index f03fc5566b8c1c6f41b39d52fa59bc3149acdb6a..cc78ee3187d8381fe3493ef081efb7e691da764c 100755 (executable)
--- a/Lib/test/test_binascii.py
+++ b/Lib/test/test_binascii.py
@@ -54,10 +54,10 @@ for i in range(256):
         fillers = fillers + c
 def addnoise(line):
     noise = fillers
-    ratio = len(line) / len(noise)
+    ratio = len(line) // len(noise)
     res = ""
     while line and noise:
-        if len(line) / len(noise) > ratio:
+        if len(line) // len(noise) > ratio:
             c, line = line[0], line[1:]
         else:
             c, noise = noise[0], noise[1:]

diff --git a/Lib/test/test_binop.py b/Lib/test/test_binop.py
index f1e654a285d1f0aa485694f31f91758ede011c0b..7eded9add9ebca0cb75d6654e518cf5a693b4193 100644 (file)
--- a/Lib/test/test_binop.py
+++ b/Lib/test/test_binop.py
@@ -42,8 +42,8 @@ class Rat(object):
         if den == 0:
             raise ZeroDivisionError, "zero denominator"
         g = gcd(den, num)
-        self.__num = long(num/g)
-        self.__den = long(den/g)
+        self.__num = long(num//g)
+        self.__den = long(den//g)
 
     def _get_num(self):
         """Accessor function for read-only 'num' attribute of Rat."""

diff --git a/Lib/test/test_compare.py b/Lib/test/test_compare.py
index bc833eacdaac3f179bf415b431edc2f0accefefe..8100aec7ab84f99bac6aa68abfe1541305af8cb4 100644 (file)
--- a/Lib/test/test_compare.py
+++ b/Lib/test/test_compare.py
@@ -47,7 +47,7 @@ def test():
     # Ensure default comparison compares id() of args
     L = []
     for i in range(10):
-        L.insert(len(L)/2, Empty())
+        L.insert(len(L)//2, Empty())
     for a in L:
         for b in L:
             if cmp(a, b) != cmp(id(a), id(b)):

diff --git a/Lib/test/test_long.py b/Lib/test/test_long.py
index e123638465c648cf1e03a1a2c97713de53ba3e7b..01d567a4ccb0381f749ceeff256a694e635a067d 100644 (file)
--- a/Lib/test/test_long.py
+++ b/Lib/test/test_long.py
@@ -76,7 +76,7 @@ def getran2(ndigits):
 
 def test_division_2(x, y):
     q, r = divmod(x, y)
-    q2, r2 = x/y, x%y
+    q2, r2 = x//y, x%y
     pab, pba = x*y, y*x
     check(pab == pba, "multiplication does not commute for", x, y)
     check(q == q2, "divmod returns different quotient than / for", x, y)
@@ -117,7 +117,7 @@ def test_bitop_identities_1(x):
     for n in range(2*SHIFT):
         p2 = 2L ** n
         check(x << n >> n == x, "x << n >> n != x for", x, n)
-        check(x / p2 == x >> n, "x / p2 != x >> n for x n p2", x, n, p2)
+        check(x // p2 == x >> n, "x // p2 != x >> n for x n p2", x, n, p2)
         check(x * p2 == x << n, "x * p2 != x << n for x n p2", x, n, p2)
         check(x & -p2 == x >> n << n == x & ~(p2 - 1),
             "not x & -p2 == x >> n << n == x & ~(p2 - 1) for x n p2",
@@ -161,7 +161,7 @@ def test_bitop_identities(maxdigits=MAXDIGITS):
         for leny in digits:
             y = getran(leny)
             test_bitop_identities_2(x, y)
-            test_bitop_identities_3(x, y, getran((lenx + leny)/2))
+            test_bitop_identities_3(x, y, getran((lenx + leny)//2))
 
 # ------------------------------------------------- hex oct repr str atol
 
@@ -296,8 +296,8 @@ def test_auto_overflow():
             checkit(x, '*', y)
 
             if y:
-                expected = longx / longy
-                got = x / y
+                expected = longx // longy
+                got = x // y
                 checkit(x, '/', y)
 
                 expected = longx // longy

diff --git a/Lib/test/test_operator.py b/Lib/test/test_operator.py
index 939c9959d521262f358d134f84be608d731a93ba..6312d9a295d9ca555b3251fd421c48afc88c7dea 100644 (file)
--- a/Lib/test/test_operator.py
+++ b/Lib/test/test_operator.py
@@ -82,7 +82,7 @@ class OperatorTestCase(unittest.TestCase):
         self.assert_(a == [0, 1, 8, 9])
 
     def test_div(self):
-        self.failUnless(operator.div(5, 2) == 2)
+        self.failUnless(operator.floordiv(5, 2) == 2)
 
     def test_floordiv(self):
         self.failUnless(operator.floordiv(5, 2) == 2)

diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
index b119f6275fa199f36de320284952e75ad24433c4..7d72b763efa447b524146179f22aa48e068173f8 100644 (file)
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -86,7 +86,7 @@ if pid == pty.CHILD:
 else:
     debug("Waiting for child (%d) to finish."%pid)
     (pid, status) = os.waitpid(pid, 0)
-    res = status / 256
+    res = status >> 8
     debug("Child (%d) exited with status %d (%d)."%(pid, res, status))
     if res == 1:
         raise TestFailed, "Child raised an unexpected exception in os.setsid()"

diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py
index 47f35f52064ceda45c707cf5f3debbe061df2a3f..4ce72b98809bdee062115bbc45a1b0473f9977ed 100755 (executable)
--- a/Lib/test/test_strftime.py
+++ b/Lib/test/test_strftime.py
@@ -64,10 +64,10 @@ def strftest(now):
         ('%M', '%02d' % now[4], 'minute, (00-59)'),
         ('%p', ampm, 'AM or PM as appropriate'),
         ('%S', '%02d' % now[5], 'seconds of current time (00-60)'),
-        ('%U', '%02d' % ((now[7] + jan1[6])/7),
+        ('%U', '%02d' % ((now[7] + jan1[6])//7),
          'week number of the year (Sun 1st)'),
         ('%w', '0?%d' % ((1+now[6]) % 7), 'weekday as a number (Sun 1st)'),
-        ('%W', '%02d' % ((now[7] + (jan1[6] - 1)%7)/7),
+        ('%W', '%02d' % ((now[7] + (jan1[6] - 1)%7)//7),
          'week number of the year (Mon 1st)'),
         # %x see below
         ('%X', '%02d:%02d:%02d' % (now[3], now[4], now[5]), '%H:%M:%S'),

diff --git a/Lib/wave.py b/Lib/wave.py
index b5f0e1ceb6b59e2e362cdd2f019f3d7816137432..d41a9bd19d54de3234618e9728d27c2c22a37c8b 100644 (file)
--- a/Lib/wave.py
+++ b/Lib/wave.py
@@ -146,7 +146,7 @@ class Wave_read:
                 if not self._fmt_chunk_read:
                     raise Error, 'data chunk before fmt chunk'
                 self._data_chunk = chunk
-                self._nframes = chunk.chunksize / self._framesize
+                self._nframes = chunk.chunksize // self._framesize
                 self._data_seek_needed = 0
                 break
             chunk.skip()
@@ -248,7 +248,7 @@ class Wave_read:
             data = self._data_chunk.read(nframes * self._framesize)
         if self._convert and data:
             data = self._convert(data)
-        self._soundpos = self._soundpos + len(data) / (self._nchannels * self._sampwidth)
+        self._soundpos = self._soundpos + len(data) // (self._nchannels * self._sampwidth)
         return data
 
     #
@@ -259,7 +259,7 @@ class Wave_read:
         wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack('<hhllh', chunk.read(14))
         if wFormatTag == WAVE_FORMAT_PCM:
             sampwidth = struct.unpack('<h', chunk.read(2))[0]
-            self._sampwidth = (sampwidth + 7) / 8
+            self._sampwidth = (sampwidth + 7) // 8
         else:
             raise Error, 'unknown format: ' + `wFormatTag`
         self._framesize = self._nchannels * self._sampwidth
@@ -403,7 +403,7 @@ class Wave_write:
 
     def writeframesraw(self, data):
         self._ensure_header_written(len(data))
-        nframes = len(data) / (self._sampwidth * self._nchannels)
+        nframes = len(data) // (self._sampwidth * self._nchannels)
         if self._convert:
             data = self._convert(data)
         if self._sampwidth > 1 and big_endian: