Avoid deprecation warnings.

diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index fe0ed0a085f4612303b4e96fcc000ed1b8cb5077..1e882e37fb1bd4d74472afdc49d6f02562429ec0 100644 (file)
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -177,7 +177,7 @@ elif os.name == "posix":
             res = re.findall(expr, data)
             if not res:
                 return _get_soname(_findLib_gcc(name))
-            res.sort(cmp= lambda x,y: cmp(_num_version(x), _num_version(y)))
+            res.sort(key=_num_version)
             return res[-1]
 
     elif sys.platform == "sunos5":

diff --git a/Lib/encodings/uu_codec.py b/Lib/encodings/uu_codec.py
index fb03758171d1218ad023f7a092584baa28111883..4b137a5474ed0fc5d21d4904605ccbb229c990e6 100644 (file)
--- a/Lib/encodings/uu_codec.py
+++ b/Lib/encodings/uu_codec.py
@@ -84,7 +84,7 @@ def uu_decode(input,errors='strict'):
             data = a2b_uu(s)
         except binascii.Error, v:
             # Workaround for broken uuencoders by /Fredrik Lundh
-            nbytes = (((ord(s[0])-32) & 63) * 4 + 5) / 3
+            nbytes = (((ord(s[0])-32) & 63) * 4 + 5) // 3
             data = a2b_uu(s[:nbytes])
             #sys.stderr.write("Warning: %s\n" % str(v))
         write(data)

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 9d62779faeb231e3fe72994dee3080d73a42d1eb..0ac458f1e3a89074b032e58b592d6c6c0286b9ad 100644 (file)
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -2066,7 +2066,7 @@ order (MRO) for bases """
                                  "attr on a property" % attr)
 
         class D(object):
-            __getitem__ = property(lambda s: 1/0)
+            __getitem__ = property(lambda s: 1.0/0.0)
 
         d = D()
         try:

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index dc02cb375e050ab2ecc19080732df6e05b011b7f..b9500318792cb7bba8f552bb859bd9218bc7f6dd 100644 (file)
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -92,7 +92,7 @@ class ExceptionTests(unittest.TestCase):
 
         self.raise_catch(TabError, "TabError")
         # can only be tested under -tt, and is the only test for -tt
-        #try: compile("try:\n\t1/0\n    \t1/0\nfinally:\n pass\n", '<string>', 'exec')
+        #try: compile("try:\n\t1.0/0.0\n    \t1.0/0.0\nfinally:\n pass\n", '<string>', 'exec')
         #except TabError: pass
         #else: self.fail("TabError not raised")
 

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index f3da0b1ce968c86249a75212b254a137309b3f8f..6c342d8fdb3925c41ff2d73dc2c9240211c33d33 100644 (file)
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -2954,7 +2954,7 @@ else:
             server_context, other_context, client_context = self.sni_contexts()
 
             def cb_raising(ssl_sock, server_name, initial_context):
-                1/0
+                1.0/0.0
             server_context.set_servername_callback(cb_raising)
 
             with self.assertRaises(ssl.SSLError) as cm, \

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 00b8d197241e4e65866e6c7a10470f7f7bb413da..44f2c573536cee900702bfc628b0b942ae04b52f 100644 (file)
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -797,7 +797,7 @@ class ThreadingExceptionTests(BaseTestCase):
                 running = True
                 while running:
                     time.sleep(0.01)
-                1/0
+                1.0/0.0
             t = threading.Thread(target=run)
             t.start()
             while not running:
@@ -824,7 +824,7 @@ class ThreadingExceptionTests(BaseTestCase):
                 running = True
                 while running:
                     time.sleep(0.01)
-                1/0
+                1.0/0.0
             t = threading.Thread(target=run)
             t.start()
             while not running:
@@ -852,7 +852,7 @@ class ThreadingExceptionTests(BaseTestCase):
                 running = True
                 while running:
                     time.sleep(0.01)
-                1/0
+                1.0/0.0
             sys.stderr = None
             t = threading.Thread(target=run)
             t.start()

diff --git a/Lib/test/test_timeit.py b/Lib/test/test_timeit.py
index 7154217b1bb3c8916a91a9338f761306c30b3af9..a084b68b3f3ec2559dee44c7143bc4aec630c922 100644 (file)
--- a/Lib/test/test_timeit.py
+++ b/Lib/test/test_timeit.py
@@ -197,7 +197,7 @@ class TestTimeit(unittest.TestCase):
 
     def test_print_exc(self):
         s = StringIO()
-        t = timeit.Timer("1/0")
+        t = timeit.Timer("1.0/0.0")
         try:
             t.timeit()
         except: