Reverting the Revision: 77368. I committed Flox's big patch for tests by

mistake. ( It may come in for sure tough)

Lib/test/infinite_reload.py

@@ -3,6 +3,5 @@
 #  reload()ing. This module is imported by test_import.py:test_infinite_reload
 #  to make sure this doesn't happen any more.
 
-import imp
 import infinite_reload
-imp.reload(infinite_reload)
+reload(infinite_reload)

Lib/test/inspect_fodder.py

@@ -15,7 +15,7 @@ def eggs(x, y):
     fr = inspect.currentframe()
     st = inspect.stack()
     p = x
-    q = y // 0
+    q = y / 0
 
 # line 20
 class StupidGit:

Lib/test/list_tests.py

@@ -4,7 +4,7 @@
 
 import sys
 import os
-import warnings
+
 from test import test_support, seq_tests
 
 class CommonTest(seq_tests.CommonTest):
@@ -36,9 +36,7 @@ def test_repr(self):
 
         self.assertEqual(str(a0), str(l0))
         self.assertEqual(repr(a0), repr(l0))
-        # Silence Py3k warning
+        self.assertEqual(`a2`, `l2`)
-        with test_support.check_warnings():
-            self.assertEqual(eval('`a2`'), eval('`l2`'))
         self.assertEqual(str(a2), "[0, 1, 2]")
         self.assertEqual(repr(a2), "[0, 1, 2]")
 
@@ -423,13 +421,6 @@ def test_reverse(self):
         self.assertRaises(TypeError, u.reverse, 42)
 
     def test_sort(self):
-        with warnings.catch_warnings():
-            # Silence Py3k warning
-            warnings.filterwarnings("ignore", "the cmp argument is not supported",
-                                    DeprecationWarning)
-            self._test_sort()
-
-    def _test_sort(self):
         u = self.type2test([1, 0])
         u.sort()
         self.assertEqual(u, [0, 1])

Lib/test/mapping_tests.py

@@ -1,7 +1,6 @@
 # tests common to dict and UserDict
 import unittest
 import UserDict
-import test_support
 
 
 class BasicTestMappingProtocol(unittest.TestCase):
@@ -55,18 +54,13 @@ def test_read(self):
         #len
         self.assertEqual(len(p), 0)
         self.assertEqual(len(d), len(self.reference))
-        #in
+        #has_key
         for k in self.reference:
+            self.assertTrue(d.has_key(k))
             self.assertTrue(k in d)
         for k in self.other:
+            self.assertFalse(d.has_key(k))
             self.assertFalse(k in d)
-        #has_key
-        # Silence Py3k warning
-        with test_support.check_warnings():
-            for k in self.reference:
-                self.assertTrue(d.has_key(k))
-            for k in self.other:
-                self.assertFalse(d.has_key(k))
         #cmp
         self.assertEqual(cmp(p,p), 0)
         self.assertEqual(cmp(d,d), 0)

Lib/test/regrtest.py

@@ -150,6 +150,7 @@
 import cStringIO
 import getopt
 import itertools
+import json
 import os
 import random
 import re
@@ -159,13 +160,15 @@
 import warnings
 import unittest
 
-with warnings.catch_warnings():
+# I see no other way to suppress these warnings;
-    # Silence Py3k warnings
+# putting them in test_grammar.py has no effect:
-    warnings.filterwarnings("ignore", "tuple parameter unpacking "
+warnings.filterwarnings("ignore", "hex/oct constants", FutureWarning,
-                            "has been removed", SyntaxWarning)
+                        ".*test.test_grammar$")
-    warnings.filterwarnings("ignore", "assignment to True or False "
+if sys.maxint > 0x7fffffff:
-                            "is forbidden", SyntaxWarning)
+    # Also suppress them in <string>, because for 64-bit platforms,
-    import json
+    # that's where test_grammar.py hides them.
+    warnings.filterwarnings("ignore", "hex/oct constants", FutureWarning,
+                            "<string>")
 
 # Ignore ImportWarnings that only occur in the source tree,
 # (because of modules with the same name as source-directories in Modules/)

Lib/test/seq_tests.py

@@ -4,7 +4,6 @@
 
 import unittest
 import sys
-import test_support
 
 # Various iterables
 # This is used for checking the constructor (here and in test_deque.py)
@@ -197,9 +196,7 @@ def test_getslice(self):
         self.assertEqual(a[ -pow(2,128L): 3 ], self.type2test([0,1,2]))
         self.assertEqual(a[ 3: pow(2,145L) ], self.type2test([3,4]))
 
-        # Silence Py3k warning
+        self.assertRaises(TypeError, u.__getslice__)
-        with test_support.check_warnings():
-            self.assertRaises(TypeError, u.__getslice__)
 
     def test_contains(self):
         u = self.type2test([0, 1, 2])

Lib/test/test_StringIO.py

@@ -137,10 +137,12 @@ class TestBuffercStringIO(TestcStringIO):
 
 
 def test_main():
-    test_support.run_unittest(TestStringIO, TestcStringIO)
+    test_support.run_unittest(
-    # Silence Py3k warning
+        TestStringIO,
-    with test_support.check_warnings():
+        TestcStringIO,
-        test_support.run_unittest(TestBufferStringIO, TestBuffercStringIO)
+        TestBufferStringIO,
+        TestBuffercStringIO
+    )
 
 if __name__ == '__main__':
     test_main()

Lib/test/test_anydbm.py

@@ -5,14 +5,12 @@
 
 import os
 import unittest
+import anydbm
 import glob
 from test import test_support
 
 _fname = test_support.TESTFN
 
-# Silence Py3k warning
-anydbm = test_support.import_module('anydbm', deprecated=True)
-
 def _delete_files():
     # we don't know the precise name the underlying database uses
     # so we use glob to locate all names

Lib/test/test_array.py

@@ -749,9 +749,7 @@ def test_coveritertraverse(self):
 
     def test_buffer(self):
         a = array.array(self.typecode, self.example)
-        # Silence Py3k warning
+        b = buffer(a)
-        with test_support.check_warnings():
-            b = buffer(a)
         self.assertEqual(b[0], a.tostring()[0])
 
     def test_weakref(self):

Lib/test/test_ast.py

@@ -1,7 +1,6 @@
 import sys, itertools, unittest
 from test import test_support
 import ast
-import warnings
 
 def to_tuple(t):
     if t is None or isinstance(t, (basestring, int, long, complex)):
@@ -303,11 +302,7 @@ def test_literal_eval_issue4907(self):
 
 
 def test_main():
-    with warnings.catch_warnings():
+    test_support.run_unittest(AST_Tests, ASTHelpers_Test)
-        # Silence Py3k warning
-        warnings.filterwarnings("ignore", "backquote not supported",
-                                SyntaxWarning)
-        test_support.run_unittest(AST_Tests, ASTHelpers_Test)
 
 def main():
     if __name__ != '__main__':

Lib/test/test_augassign.py

@@ -2,7 +2,6 @@
 
 from test.test_support import run_unittest
 import unittest
-import warnings
 
 
 class AugAssignTest(unittest.TestCase):
@@ -325,11 +324,7 @@ def __ilshift__(self, val):
 '''.splitlines())
 
 def test_main():
-    with warnings.catch_warnings():
+    run_unittest(AugAssignTest)
-        # Silence Py3k warning
-        warnings.filterwarnings("ignore", "classic int division",
-                                DeprecationWarning)
-        run_unittest(AugAssignTest)
 
 if __name__ == '__main__':
     test_main()

Lib/test/test_bigmem.py

@@ -97,21 +97,21 @@ def basic_encode_test(self, size, enc, c=u'.', expectedsize=None):
     def test_encode(self, size):
         return self.basic_encode_test(size, 'utf-8')
 
-    @precisionbigmemtest(size=_4G // 6 + 2, memuse=2)
+    @precisionbigmemtest(size=_4G / 6 + 2, memuse=2)
     def test_encode_raw_unicode_escape(self, size):
         try:
             return self.basic_encode_test(size, 'raw_unicode_escape')
         except MemoryError:
             pass # acceptable on 32-bit
 
-    @precisionbigmemtest(size=_4G // 5 + 70, memuse=3)
+    @precisionbigmemtest(size=_4G / 5 + 70, memuse=3)
     def test_encode_utf7(self, size):
         try:
             return self.basic_encode_test(size, 'utf7')
         except MemoryError:
             pass # acceptable on 32-bit
 
-    @precisionbigmemtest(size=_4G // 4 + 5, memuse=6)
+    @precisionbigmemtest(size=_4G / 4 + 5, memuse=6)
     def test_encode_utf32(self, size):
         try:
             return self.basic_encode_test(size, 'utf32', expectedsize=4*size+4)
@@ -122,7 +122,7 @@ def test_encode_utf32(self, size):
     def test_decodeascii(self, size):
         return self.basic_encode_test(size, 'ascii', c='A')
 
-    @precisionbigmemtest(size=_4G // 5, memuse=6+2)
+    @precisionbigmemtest(size=_4G / 5, memuse=6+2)
     def test_unicode_repr_oflw(self, size):
         try:
             s = u"\uAAAA"*size
@@ -516,7 +516,7 @@ def test_repr_large(self, size):
         self.assertEquals(s.count('\\'), size)
         self.assertEquals(s.count('0'), size * 2)
 
-    @bigmemtest(minsize=2**32 // 5, memuse=6+2)
+    @bigmemtest(minsize=2**32 / 5, memuse=6+2)
     def test_unicode_repr(self, size):
         s = u"\uAAAA" * size
         self.assertTrue(len(repr(s)) > size)
@@ -1053,9 +1053,7 @@ class BufferTest(unittest.TestCase):
     @precisionbigmemtest(size=_1G, memuse=4)
     def test_repeat(self, size):
         try:
-            # Silence Py3k warning
+            b = buffer("AAAA")*size
-            with test_support.check_warnings():
-                b = buffer("AAAA")*size
         except MemoryError:
             pass # acceptable on 32-bit
         else:

Lib/test/test_binascii.py

@@ -26,10 +26,10 @@ def test_functions(self):
                 prefixes.extend(["crc_", "rlecode_", "rledecode_"])
             for prefix in prefixes:
                 name = prefix + suffix
-                self.assertTrue(hasattr(getattr(binascii, name), '__call__'))
+                self.assertTrue(callable(getattr(binascii, name)))
                 self.assertRaises(TypeError, getattr(binascii, name))
         for name in ("hexlify", "unhexlify"):
-            self.assertTrue(hasattr(getattr(binascii, name), '__call__'))
+            self.assertTrue(callable(getattr(binascii, name)))
             self.assertRaises(TypeError, getattr(binascii, name))
 
     def test_base64valid(self):

Lib/test/test_binop.py

@@ -207,9 +207,6 @@ def __ne__(self, other):
         """Compare two Rats for inequality."""
         return not self == other
 
-    # Silence Py3k warning
-    __hash__ = None
-
 class RatTestCase(unittest.TestCase):
     """Unit tests for Rat class and its support utilities."""
 

Lib/test/test_bool.py

@@ -91,10 +91,10 @@ def test_math(self):
         self.assertEqual(False*1, 0)
         self.assertIsNot(False*1, False)
 
-        self.assertEqual(True//1, 1)
+        self.assertEqual(True/1, 1)
-        self.assertIsNot(True//1, True)
+        self.assertIsNot(True/1, True)
-        self.assertEqual(False//1, 0)
+        self.assertEqual(False/1, 0)
-        self.assertIsNot(False//1, False)
+        self.assertIsNot(False/1, False)
 
         for b in False, True:
             for i in 0, 1, 2:
@@ -168,8 +168,8 @@ def test_hasattr(self):
         self.assertIs(hasattr([], "wobble"), False)
 
     def test_callable(self):
-        self.assertTrue(hasattr(len, '__call__'), True)
+        self.assertIs(callable(len), True)
-        self.assertFalse(hasattr(1, '__call__'), False)
+        self.assertIs(callable(1), False)
 
     def test_isinstance(self):
         self.assertIs(isinstance(True, bool), True)
@@ -184,12 +184,8 @@ def test_issubclass(self):
         self.assertIs(issubclass(int, bool), False)
 
     def test_haskey(self):
-        self.assertIs(1 in {}, False)
+        self.assertIs({}.has_key(1), False)
-        self.assertIs(1 in {1:1}, True)
+        self.assertIs({1:1}.has_key(1), True)
-        # Silence Py3k warning
-        with test_support.check_warnings():
-            self.assertIs({}.has_key(1), False)
-            self.assertIs({1:1}.has_key(1), True)
 
     def test_string(self):
         self.assertIs("xyz".endswith("z"), True)
@@ -261,10 +257,8 @@ def test_operator(self):
         import operator
         self.assertIs(operator.truth(0), False)
         self.assertIs(operator.truth(1), True)
-        # Silence Py3k warning
+        self.assertIs(operator.isCallable(0), False)
-        with test_support.check_warnings():
+        self.assertIs(operator.isCallable(len), True)
-            self.assertIs(operator.isCallable(0), False)
-            self.assertIs(operator.isCallable(len), True)
         self.assertIs(operator.isNumberType(None), False)
         self.assertIs(operator.isNumberType(0), True)
         self.assertIs(operator.not_(1), False)

Lib/test/test_buffer.py

@@ -6,7 +6,6 @@
 
 import unittest
 from test import test_support
-import warnings
 
 class BufferTests(unittest.TestCase):
 
@@ -24,11 +23,7 @@ def test_extended_getslice(self):
 
 
 def test_main():
-    with warnings.catch_warnings():
+    test_support.run_unittest(BufferTests)
-        # Silence Py3k warning
-        warnings.filterwarnings("ignore", "buffer.. not supported",
-                                DeprecationWarning)
-        test_support.run_unittest(BufferTests)
 
 if __name__ == "__main__":
     test_main()

Lib/test/test_builtin.py

@@ -7,6 +7,10 @@
 from operator import neg
 
 import sys, warnings, cStringIO, random, fractions, UserDict
+warnings.filterwarnings("ignore", "hex../oct.. of negative int",
+                        FutureWarning, __name__)
+warnings.filterwarnings("ignore", "integer argument expected",
+                        DeprecationWarning, "unittest")
 
 # count the number of test runs.
 # used to skip running test_execfile() multiple times
@@ -415,11 +419,7 @@ def keys(self):
     f.write('z = z+1\n')
     f.write('z = z*2\n')
     f.close()
-    with warnings.catch_warnings():
+    execfile(TESTFN)
-        # Silence Py3k warning
-        warnings.filterwarnings("ignore", ".+ not supported in 3.x",
-                                DeprecationWarning)
-        execfile(TESTFN)
 
     def test_execfile(self):
         global numruns
@@ -1542,30 +1542,17 @@ def test_baddecorator(self):
         data = 'The quick Brown fox Jumped over The lazy Dog'.split()
         self.assertRaises(TypeError, sorted, data, None, lambda x,y: 0)
 
-def _run_unittest(*args):
-    with warnings.catch_warnings():
-        # Silence Py3k warnings
-        warnings.filterwarnings("ignore", ".+ not supported in 3.x",
-                                DeprecationWarning)
-        warnings.filterwarnings("ignore", ".+ is renamed to imp.reload",
-                                DeprecationWarning)
-        warnings.filterwarnings("ignore", "integer argument expected, got float",
-                                DeprecationWarning)
-        warnings.filterwarnings("ignore", "classic int division",
-                                DeprecationWarning)
-        run_unittest(*args)
-
 def test_main(verbose=None):
     test_classes = (BuiltinTest, TestSorted)
 
-    _run_unittest(*test_classes)
+    run_unittest(*test_classes)
 
     # verify reference counting
     if verbose and hasattr(sys, "gettotalrefcount"):
         import gc
         counts = [None] * 5
         for i in xrange(len(counts)):
-            _run_unittest(*test_classes)
+            run_unittest(*test_classes)
             gc.collect()
             counts[i] = sys.gettotalrefcount()
         print counts

Lib/test/test_call.py

@@ -12,9 +12,7 @@ def test_varargs0(self):
         self.assertRaises(TypeError, {}.has_key)
 
     def test_varargs1(self):
-        # Silence Py3k warning
+        {}.has_key(0)
-        with test_support.check_warnings():
-            {}.has_key(0)
 
     def test_varargs2(self):
         self.assertRaises(TypeError, {}.has_key, 0, 1)
@@ -26,15 +24,11 @@ def test_varargs0_ext(self):
             pass
 
     def test_varargs1_ext(self):
-        # Silence Py3k warning
+        {}.has_key(*(0,))
-        with test_support.check_warnings():
-            {}.has_key(*(0,))
 
     def test_varargs2_ext(self):
         try:
-            # Silence Py3k warning
+            {}.has_key(*(1, 2))
-            with test_support.check_warnings():
-                {}.has_key(*(1, 2))
         except TypeError:
             pass
         else:

Lib/test/test_capi.py

@@ -55,7 +55,7 @@ class foo(object):pass
         context = foo()
         context.l = []
         context.n = 2 #submits per thread
-        context.nThreads = n // context.n
+        context.nThreads = n / context.n
         context.nFinished = 0
         context.lock = threading.Lock()
         context.event = threading.Event()

Lib/test/test_cgi.py

@@ -104,7 +104,7 @@ def do_test(buf, method):
 
 def norm(list):
     if type(list) == type([]):
-        list.sort(key=str)
+        list.sort()
     return list
 
 def first_elts(list):

Lib/test/test_class.py

@@ -1,7 +1,7 @@
 "Test the functionality of Python classes implementing operators."
 
 import unittest
-import warnings
+
 from test import test_support
 
 testmeths = [
@@ -407,7 +407,7 @@ def testMisc(self):
         self.assertCallStack([("__coerce__", (testme, 1)), ('__cmp__', (testme, 1))])
 
         callLst[:] = []
-        eval('testme <> 1')  # XXX kill this in py3k
+        testme <> 1  # XXX kill this in py3k
         self.assertCallStack([("__coerce__", (testme, 1)), ('__cmp__', (testme, 1))])
 
         callLst[:] = []
@@ -427,7 +427,7 @@ def testMisc(self):
         self.assertCallStack([("__coerce__", (testme, 1)), ('__cmp__', (1, testme))])
 
         callLst[:] = []
-        eval('1 <> testme')
+        1 <> testme
         self.assertCallStack([("__coerce__", (testme, 1)), ('__cmp__', (1, testme))])
 
         callLst[:] = []
@@ -616,15 +616,7 @@ class B(A):
         hash(a.f)
 
 def test_main():
-    with warnings.catch_warnings():
+    test_support.run_unittest(ClassTests)
-        # Silence Py3k warnings
-        warnings.filterwarnings("ignore", ".+slice__ has been removed",
-                                DeprecationWarning)
-        warnings.filterwarnings("ignore", "classic int division",
-                                DeprecationWarning)
-        warnings.filterwarnings("ignore", "<> not supported",
-                                DeprecationWarning)
-        test_support.run_unittest(ClassTests)
 
 if __name__=='__main__':
     test_main()

Lib/test/test_coercion.py

@@ -223,11 +223,8 @@ def process_infix_results():
             infix_results[key] = res
 
 
-with warnings.catch_warnings():
+
-    # Silence Py3k warning
+process_infix_results()
-    warnings.filterwarnings("ignore", "classic int division",
-                            DeprecationWarning)
-    process_infix_results()
 # now infix_results has two lists of results for every pairing.
 
 prefix_binops = [ 'divmod' ]
@@ -340,14 +337,11 @@ def __coerce__(self, other):
             raise exc
 
 def test_main():
-    with warnings.catch_warnings():
+    warnings.filterwarnings("ignore",
-        # Silence Py3k warnings
+                            r'complex divmod\(\), // and % are deprecated',
-        warnings.filterwarnings("ignore",
+                            DeprecationWarning,
-                                "complex divmod.., // and % are deprecated",
+                            r'test.test_coercion$')
-                                DeprecationWarning)
+    run_unittest(CoercionTest)
-        warnings.filterwarnings("ignore", "classic .+ division",
-                                DeprecationWarning)
-        run_unittest(CoercionTest)
 
 if __name__ == "__main__":
     test_main()

Lib/test/test_collections.py

@@ -510,10 +510,8 @@ def test_basics(self):
                          [('a', 3), ('b', 2), ('c', 1)])
         self.assertEqual(c['b'], 2)
         self.assertEqual(c['z'], 0)
-        # Silence Py3k warning
+        self.assertEqual(c.has_key('c'), True)
-        with test_support.check_warnings():
+        self.assertEqual(c.has_key('z'), False)
-            self.assertEqual(c.has_key('c'), True)
-            self.assertEqual(c.has_key('z'), False)
         self.assertEqual(c.__contains__('c'), True)
         self.assertEqual(c.__contains__('z'), False)
         self.assertEqual(c.get('b', 10), 2)

Lib/test/test_commands.py

@@ -9,10 +9,7 @@
 warnings.filterwarnings('ignore', r".*commands.getstatus.. is deprecated",
                         DeprecationWarning)
 
-from test.test_support import run_unittest, reap_children, import_module
+from test.test_support import run_unittest, reap_children
-
-# Silence Py3k warning
-import_module('commands', deprecated=True)
 from commands import *
 
 # The module says:

Lib/test/test_compile.py

@@ -2,7 +2,6 @@
 import sys
 import _ast
 from test import test_support
-import textwrap
 
 class TestSpecifics(unittest.TestCase):
 
@@ -142,9 +141,7 @@ def f(x):
         self.assertEqual(f(5), 0)
 
     def test_complex_args(self):
-        # Silence Py3k warning
+
-        with test_support.check_warnings():
-            exec textwrap.dedent('''
         def comp_args((a, b)):
             return a,b
         self.assertEqual(comp_args((1, 2)), (1, 2))
@@ -162,7 +159,6 @@ def comp_args(a=2, (b, c)=(3, 4)):
             return a, b, c
         self.assertEqual(comp_args(1, (2, 3)), (1, 2, 3))
         self.assertEqual(comp_args(), (2, 3, 4))
-        ''')
 
     def test_argument_order(self):
         try:

Lib/test/test_compiler.py

@@ -75,7 +75,7 @@ def f(*args, **kwargs):
 
     def testTryExceptFinally(self):
         # Test that except and finally clauses in one try stmt are recognized
-        c = compiler.compile("try:\n 1//0\nexcept:\n e = 1\nfinally:\n f = 1",
+        c = compiler.compile("try:\n 1/0\nexcept:\n e = 1\nfinally:\n f = 1",
                              "<string>", "exec")
         dct = {}
         exec c in dct

Lib/test/test_complex_args.py

@@ -1,31 +1,23 @@
 
 import unittest
 from test import test_support
-import textwrap
-import warnings
 
 class ComplexArgsTestCase(unittest.TestCase):
 
     def check(self, func, expected, *args):
         self.assertEqual(func(*args), expected)
 
-    # These functions are tested below as lambdas too.  If you add a
+    # These functions are tested below as lambdas too.  If you add a function test,
-    # function test, also add a similar lambda test.
+    # also add a similar lambda test.
-
-    # Functions are wrapped in "exec" statements in order to
-    # silence Py3k warnings
 
     def test_func_parens_no_unpacking(self):
-        exec textwrap.dedent("""
         def f(((((x))))): return x
         self.check(f, 1, 1)
         # Inner parens are elided, same as: f(x,)
         def f(((x)),): return x
         self.check(f, 2, 2)
-        """)
 
     def test_func_1(self):
-        exec textwrap.dedent("""
         def f(((((x),)))): return x
         self.check(f, 3, (3,))
         def f(((((x)),))): return x
@@ -34,22 +26,16 @@ def f(((((x))),)): return x
         self.check(f, 5, (5,))
         def f(((x),)): return x
         self.check(f, 6, (6,))
-        """)
 
     def test_func_2(self):
-        exec textwrap.dedent("""
         def f(((((x)),),)): return x
         self.check(f, 2, ((2,),))
-        """)
 
     def test_func_3(self):
-        exec textwrap.dedent("""
         def f((((((x)),),),)): return x
         self.check(f, 3, (((3,),),))
-        """)
 
     def test_func_complex(self):
-        exec textwrap.dedent("""
         def f((((((x)),),),), a, b, c): return x, a, b, c
         self.check(f, (3, 9, 8, 7), (((3,),),), 9, 8, 7)
 
@@ -58,22 +44,18 @@ def f(((((((x)),)),),), a, b, c): return x, a, b, c
 
         def f(a, b, c, ((((((x)),)),),)): return a, b, c, x
         self.check(f, (9, 8, 7, 3), 9, 8, 7, (((3,),),))
-        """)
 
     # Duplicate the tests above, but for lambda.  If you add a lambda test,
     # also add a similar function test above.
 
     def test_lambda_parens_no_unpacking(self):
-        exec textwrap.dedent("""
         f = lambda (((((x))))): x
         self.check(f, 1, 1)
         # Inner parens are elided, same as: f(x,)
         f = lambda ((x)),: x
         self.check(f, 2, 2)
-        """)
 
     def test_lambda_1(self):
-        exec textwrap.dedent("""
         f = lambda (((((x),)))): x
         self.check(f, 3, (3,))
         f = lambda (((((x)),))): x
@@ -82,22 +64,16 @@ def test_lambda_1(self):
         self.check(f, 5, (5,))
         f = lambda (((x),)): x
         self.check(f, 6, (6,))
-        """)
 
     def test_lambda_2(self):
-        exec textwrap.dedent("""
         f = lambda (((((x)),),)): x
         self.check(f, 2, ((2,),))
-        """)
 
     def test_lambda_3(self):
-        exec textwrap.dedent("""
         f = lambda ((((((x)),),),)): x
         self.check(f, 3, (((3,),),))
-        """)
 
     def test_lambda_complex(self):
-        exec textwrap.dedent("""
         f = lambda (((((x)),),),), a, b, c: (x, a, b, c)
         self.check(f, (3, 9, 8, 7), (((3,),),), 9, 8, 7)
 
@@ -106,17 +82,10 @@ def test_lambda_complex(self):
 
         f = lambda a, b, c, ((((((x)),)),),): (a, b, c, x)
         self.check(f, (9, 8, 7, 3), 9, 8, 7, (((3,),),))
-        """)
 
 
 def test_main():
-    with warnings.catch_warnings():
+    test_support.run_unittest(ComplexArgsTestCase)
-        # Silence Py3k warnings
-        warnings.filterwarnings("ignore", "tuple parameter unpacking "
-                                "has been removed", SyntaxWarning)
-        warnings.filterwarnings("ignore", "parenthesized argument names "
-                                "are invalid", SyntaxWarning)
-        test_support.run_unittest(ComplexArgsTestCase)
 
 if __name__ == "__main__":
     test_main()

Lib/test/test_copy.py

@@ -661,7 +661,7 @@ def __init__(self, i):
         v = copy.deepcopy(u)
         self.assertNotEqual(v, u)
         self.assertEqual(len(v), 2)
-        (x, y), (z, t) = sorted(v.items(), key=lambda k: k[0].i)
+        (x, y), (z, t) = sorted(v.items(), key=lambda (k, v): k.i)
         self.assertFalse(x is a)
         self.assertEqual(x.i, a.i)
         self.assertTrue(y is b)

Lib/test/test_ctypes.py

@@ -4,19 +4,12 @@
 #Skip tests if _ctypes module does not exist
 import_module('_ctypes')
 
-import warnings
 import ctypes.test
 
 def test_main():
     skipped, testcases = ctypes.test.get_tests(ctypes.test, "test_*.py", verbosity=0)
     suites = [unittest.makeSuite(t) for t in testcases]
-    with warnings.catch_warnings():
+    run_unittest(unittest.TestSuite(suites))
-        # Silence Py3k warnings
-        warnings.filterwarnings("ignore", "buffer.. not supported",
-                                DeprecationWarning)
-        warnings.filterwarnings("ignore", "classic long division",
-                                DeprecationWarning)
-        run_unittest(unittest.TestSuite(suites))
 
 if __name__ == "__main__":
     test_main()

Lib/test/test_decimal.py

@@ -31,8 +31,7 @@
 import unittest
 from decimal import *
 import numbers
-from test.test_support import (run_unittest, run_doctest,
+from test.test_support import (run_unittest, run_doctest, is_resource_enabled)
-                               is_resource_enabled, check_warnings)
 import random
 try:
     import threading
@@ -203,7 +202,7 @@ def eval_file(self, file):
         if skip_expected:
             raise unittest.SkipTest
             return
-        for line in open(file):
+        for line in open(file).xreadlines():
             line = line.replace('\r\n', '').replace('\n', '')
             #print line
             try:
@@ -362,10 +361,8 @@ def FixQuotes(val):
         myexceptions = self.getexceptions()
         self.context.clear_flags()
 
-        # Silence Py3k warning
+        myexceptions.sort()
-        with check_warnings():
+        theirexceptions.sort()
-            myexceptions.sort()
-            theirexceptions.sort()
 
         self.assertEqual(result, ans,
                          'Incorrect answer for ' + s + ' -- got ' + result)
@@ -620,14 +617,12 @@ def __ne__(self, other):
             ('//', '__floordiv__', '__rfloordiv__'),
             ('**', '__pow__', '__rpow__')
         ]
-        # Silence Py3k warning
+        if 1/2 == 0:
-        with check_warnings():
+            # testing with classic division, so add __div__
-            if 1/2 == 0:
+            oplist.append(('/', '__div__', '__rdiv__'))
-                # testing with classic division, so add __div__
+        else:
-                oplist.append(('/', '__div__', '__rdiv__'))
+            # testing with -Qnew, so add __truediv__
-            else:
+            oplist.append(('/', '__truediv__', '__rtruediv__'))
-                # testing with -Qnew, so add __truediv__
-                oplist.append(('/', '__truediv__', '__rtruediv__'))
 
         for sym, lop, rop in oplist:
             setattr(E, lop, lambda self, other: 'str' + lop + str(other))
@@ -1199,10 +1194,8 @@ def test_comparison_operators(self):
         self.assertEqual(a, b)
 
         # with None
-        # Silence Py3k warning
+        self.assertFalse(Decimal(1) < None)
-        with check_warnings():
+        self.assertTrue(Decimal(1) > None)
-            self.assertFalse(Decimal(1) < None)
-            self.assertTrue(Decimal(1) > None)
 
     def test_copy_and_deepcopy_methods(self):
         d = Decimal('43.24')
@@ -1711,14 +1704,11 @@ def test_flags_irrelevant(self):
                 for flag in extra_flags:
                     if flag not in expected_flags:
                         expected_flags.append(flag)
+                expected_flags.sort()
 
                 # flags we actually got
                 new_flags = [k for k,v in context.flags.items() if v]
-
+                new_flags.sort()
-                # Silence Py3k warning
-                with check_warnings():
-                    expected_flags.sort()
-                    new_flags.sort()
 
                 self.assertEqual(ans, new_ans,
                                  "operation produces different answers depending on flags set: " +

Lib/test/test_descr.py

@@ -4598,19 +4598,9 @@ def __pow__(self, *args):
 
 
 def test_main():
-    with warnings.catch_warnings():
+    # Run all local test cases, with PTypesLongInitTest first.
-        # Silence Py3k warnings
+    test_support.run_unittest(PTypesLongInitTest, OperatorsTest,
-        warnings.filterwarnings("ignore", "classic .+ division",
+                              ClassPropertiesAndMethods, DictProxyTests)
-                                DeprecationWarning)
-        warnings.filterwarnings("ignore", "coerce.. not supported",
-                                DeprecationWarning)
-        warnings.filterwarnings("ignore", "Overriding __cmp__ ",
-                                DeprecationWarning)
-        warnings.filterwarnings("ignore", ".+slice__ has been removed",
-                                DeprecationWarning)
-        # Run all local test cases, with PTypesLongInitTest first.
-        test_support.run_unittest(PTypesLongInitTest, OperatorsTest,
-                                  ClassPropertiesAndMethods, DictProxyTests)
 
 if __name__ == "__main__":
     test_main()

Lib/test/test_descrtut.py

@@ -66,7 +66,7 @@ def merge(self, other):
 statement or the built-in function eval():
 
     >>> def sorted(seq):
-    ...     seq.sort(key=str)
+    ...     seq.sort()
     ...     return seq
     >>> print sorted(a.keys())
     [1, 2]

Lib/test/test_dict.py

@@ -33,12 +33,8 @@ def test_keys(self):
         self.assertEqual(d.keys(), [])
         d = {'a': 1, 'b': 2}
         k = d.keys()
-        self.assertTrue('a' in d)
+        self.assertTrue(d.has_key('a'))
-        self.assertTrue('b' in d)
+        self.assertTrue(d.has_key('b'))
-        # Silence Py3k warning
-        with test_support.check_warnings():
-            self.assertTrue(d.has_key('a'))
-            self.assertTrue(d.has_key('b'))
 
         self.assertRaises(TypeError, d.keys, None)
 
@@ -61,16 +57,14 @@ def test_items(self):
 
     def test_has_key(self):
         d = {}
-        self.assertTrue('a' not in d)
+        self.assertTrue(not d.has_key('a'))
-        # Silence Py3k warning
-        with test_support.check_warnings():
-            self.assertTrue(not d.has_key('a'))
-            self.assertRaises(TypeError, d.has_key)
         d = {'a': 1, 'b': 2}
         k = d.keys()
         k.sort()
         self.assertEqual(k, ['a', 'b'])
 
+        self.assertRaises(TypeError, d.has_key)
+
     def test_contains(self):
         d = {}
         self.assertTrue(not ('a' in d))
@@ -401,6 +395,8 @@ def __repr__(self):
         self.assertRaises(Exc, repr, d)
 
     def test_le(self):
+        self.assertTrue(not ({} < {}))
+        self.assertTrue(not ({1: 2} < {1L: 2L}))
 
         class Exc(Exception): pass
 
@@ -412,18 +408,12 @@ def __hash__(self):
 
         d1 = {BadCmp(): 1}
         d2 = {1: 1}
-
+        try:
-        # Silence Py3k warning
+            d1 < d2
-        with test_support.check_warnings():
+        except Exc:
-            self.assertTrue(not ({} < {}))
+            pass
-            self.assertTrue(not ({1: 2} < {1L: 2L}))
+        else:
-
+            self.fail("< didn't raise Exc")
-            try:
-                d1 < d2
-            except Exc:
-                pass
-            else:
-                self.fail("< didn't raise Exc")
 
     def test_missing(self):
         # Make sure dict doesn't have a __missing__ method
@@ -511,9 +501,7 @@ def __cmp__(self, other):
                      'd.pop(x2)',
                      'd.update({x2: 2})']:
             try:
-                # Silence Py3k warning
+                exec stmt in locals()
-                with test_support.check_warnings():
-                    exec stmt in locals()
             except CustomException:
                 pass
             else:
@@ -561,7 +549,7 @@ def test_empty_presized_dict_in_freelist(self):
         # Bug #3537: if an empty but presized dict with a size larger
         # than 7 was in the freelist, it triggered an assertion failure
         try:
-            d = {'a': 1 // 0, 'b': None, 'c': None, 'd': None, 'e': None,
+            d = {'a': 1/0,  'b': None, 'c': None, 'd': None, 'e': None,
                  'f': None, 'g': None, 'h': None}
         except ZeroDivisionError:
             pass

Lib/test/test_exceptions.py

@@ -7,7 +7,7 @@
 import warnings
 
 from test.test_support import TESTFN, unlink, run_unittest, captured_output
-from test.test_pep352 import ignore_deprecation_warnings
+from test.test_pep352 import ignore_message_warning
 
 # XXX This is not really enough, each *operation* should be tested!
 
@@ -17,7 +17,6 @@ def testReload(self):
         # Reloading the built-in exceptions module failed prior to Py2.2, while it
         # should act the same as reloading built-in sys.
         try:
-            from imp import reload
             import exceptions
             reload(exceptions)
         except ImportError, e:
@@ -109,11 +108,11 @@ def testRaising(self):
         self.assertRaises(ValueError, chr, 10000)
 
         self.raise_catch(ZeroDivisionError, "ZeroDivisionError")
-        try: x = 1 // 0
+        try: x = 1/0
         except ZeroDivisionError: pass
 
         self.raise_catch(Exception, "Exception")
-        try: x = 1 // 0
+        try: x = 1/0
         except Exception, e: pass
 
     def testSyntaxErrorMessage(self):
@@ -198,7 +197,6 @@ def test_WindowsError(self):
             self.assertEqual(WindowsError(1001, "message").errno, 22)
             self.assertEqual(WindowsError(1001, "message").winerror, 1001)
 
-    @ignore_deprecation_warnings
     def testAttributes(self):
         # test that exception attributes are happy
 
@@ -276,32 +274,34 @@ def testAttributes(self):
         except NameError:
             pass
 
-        for exc, args, expected in exceptionList:
+        with warnings.catch_warnings():
-            try:
+            ignore_message_warning()
-                raise exc(*args)
+            for exc, args, expected in exceptionList:
-            except BaseException, e:
+                try:
-                if type(e) is not exc:
+                    raise exc(*args)
-                    raise
+                except BaseException, e:
-                # Verify module name
+                    if type(e) is not exc:
-                self.assertEquals(type(e).__module__, 'exceptions')
+                        raise
-                # Verify no ref leaks in Exc_str()
+                    # Verify module name
-                s = str(e)
+                    self.assertEquals(type(e).__module__, 'exceptions')
-                for checkArgName in expected:
+                    # Verify no ref leaks in Exc_str()
-                    self.assertEquals(repr(getattr(e, checkArgName)),
+                    s = str(e)
-                                      repr(expected[checkArgName]),
+                    for checkArgName in expected:
-                                      'exception "%s", attribute "%s"' %
+                        self.assertEquals(repr(getattr(e, checkArgName)),
-                                       (repr(e), checkArgName))
+                                          repr(expected[checkArgName]),
+                                          'exception "%s", attribute "%s"' %
+                                           (repr(e), checkArgName))
 
-                # test for pickling support
+                    # test for pickling support
-                for p in pickle, cPickle:
+                    for p in pickle, cPickle:
-                    for protocol in range(p.HIGHEST_PROTOCOL + 1):
+                        for protocol in range(p.HIGHEST_PROTOCOL + 1):
-                        new = p.loads(p.dumps(e, protocol))
+                            new = p.loads(p.dumps(e, protocol))
-                        for checkArgName in expected:
+                            for checkArgName in expected:
-                            got = repr(getattr(new, checkArgName))
+                                got = repr(getattr(new, checkArgName))
-                            want = repr(expected[checkArgName])
+                                want = repr(expected[checkArgName])
-                            self.assertEquals(got, want,
+                                self.assertEquals(got, want,
-                                              'pickled "%r", attribute "%s"' %
+                                                  'pickled "%r", attribute "%s"' %
-                                              (e, checkArgName))
+                                                  (e, checkArgName))
 
 
     def testDeprecatedMessageAttribute(self):
@@ -330,7 +330,6 @@ def testRegularMessageAttribute(self):
         with self.assertRaises(AttributeError):
             exc.message
 
-    @ignore_deprecation_warnings
     def testPickleMessageAttribute(self):
         # Pickling with message attribute must work, as well.
         e = Exception("foo")
@@ -338,7 +337,9 @@ def testPickleMessageAttribute(self):
         f.message = "bar"
         for p in pickle, cPickle:
             ep = p.loads(p.dumps(e))
-            self.assertEqual(ep.message, "foo")
+            with warnings.catch_warnings():
+                ignore_message_warning()
+                self.assertEqual(ep.message, "foo")
             fp = p.loads(p.dumps(f))
             self.assertEqual(fp.message, "bar")
 
@@ -347,12 +348,7 @@ def testSlicing(self):
         # going through the 'args' attribute.
         args = (1, 2, 3)
         exc = BaseException(*args)
-        self.assertEqual(exc.args[:], args)
+        self.assertEqual(exc[:], args)
-        with warnings.catch_warnings():
-            # Silence Py3k warning
-            warnings.filterwarnings("ignore", "__getslice__ not supported for "
-                                    "exception classes", DeprecationWarning)
-            self.assertEqual(exc[:], args)
 
     def testKeywordArgs(self):
         # test that builtin exception don't take keyword args,

Lib/test/test_file.py

@@ -127,7 +127,7 @@ def testMethods(self):
         self.assertEquals(self.f.__exit__(None, None, None), None)
         # it must also return None if an exception was given
         try:
-            1 // 0
+            1/0
         except:
             self.assertEquals(self.f.__exit__(*sys.exc_info()), None)
 

Lib/test/test_file2k.py

@@ -34,17 +34,13 @@ def testWeakRefs(self):
     def testAttributes(self):
         # verify expected attributes exist
         f = self.f
-        # Silence Py3k warning
+        softspace = f.softspace
-        with test_support.check_warnings():
-            softspace = f.softspace
         f.name     # merely shouldn't blow up
         f.mode     # ditto
         f.closed   # ditto
 
-        # Silence Py3k warning
+        # verify softspace is writable
-        with test_support.check_warnings():
+        f.softspace = softspace    # merely shouldn't blow up
-            # verify softspace is writable
-            f.softspace = softspace    # merely shouldn't blow up
 
         # verify the others aren't
         for attr in 'name', 'mode', 'closed':
@@ -102,8 +98,7 @@ def testErrors(self):
     def testMethods(self):
         methods = ['fileno', 'flush', 'isatty', 'next', 'read', 'readinto',
                    'readline', 'readlines', 'seek', 'tell', 'truncate',
-                   'write', '__iter__']
+                   'write', 'xreadlines', '__iter__']
-        deprecated_methods = ['xreadlines']
         if sys.platform.startswith('atheos'):
             methods.remove('truncate')
 
@@ -115,18 +110,13 @@ def testMethods(self):
             method = getattr(self.f, methodname)
             # should raise on closed file
             self.assertRaises(ValueError, method)
-        # Silence Py3k warning
-        with test_support.check_warnings():
-            for methodname in deprecated_methods:
-                method = getattr(self.f, methodname)
-                self.assertRaises(ValueError, method)
         self.assertRaises(ValueError, self.f.writelines, [])
 
         # file is closed, __exit__ shouldn't do anything
         self.assertEquals(self.f.__exit__(None, None, None), None)
         # it must also return None if an exception was given
         try:
-            1 // 0
+            1/0
         except:
             self.assertEquals(self.f.__exit__(*sys.exc_info()), None)
 
@@ -192,12 +182,12 @@ def testBadModeArgument(self):
         try:
             f = open(TESTFN, bad_mode)
         except ValueError, msg:
-            if msg.args[0] != 0:
+            if msg[0] != 0:
                 s = str(msg)
                 if s.find(TESTFN) != -1 or s.find(bad_mode) == -1:
                     self.fail("bad error message for invalid mode: %s" % s)
-            # if msg.args[0] == 0, we're probably on Windows where there may
+            # if msg[0] == 0, we're probably on Windows where there may be
-            # be no obvious way to discover why open() failed.
+            # no obvious way to discover why open() failed.
         else:
             f.close()
             self.fail("no error for invalid mode: %s" % bad_mode)

Lib/test/test_fractions.py

@@ -43,10 +43,6 @@ def __sub__(self, other):
         assert False, "__sub__ should not be invoked for comparisons"
     __rsub__ = __sub__
 
-    # Silence Py3k warning
-    def __hash__(self):
-        assert False, "__hash__ should not be invoked for comparisons"
-
 
 class DummyRational(object):
     """Test comparison of Fraction with a naive rational implementation."""
@@ -80,11 +76,6 @@ def __ge__(self, other):
     def __float__(self):
         assert False, "__float__ should not be invoked"
 
-    # Silence Py3k warning
-    def __hash__(self):
-        assert False, "__hash__ should not be invoked for comparisons"
-
-
 class GcdTest(unittest.TestCase):
 
     def testMisc(self):

Lib/test/test_ftplib.py

@@ -100,7 +100,7 @@ def cmd_pasv(self, arg):
         sock.listen(5)
         sock.settimeout(2)
         ip, port = sock.getsockname()[:2]
-        ip = ip.replace('.', ','); p1, p2 = divmod(port, 256)
+        ip = ip.replace('.', ','); p1 = port / 256; p2 = port % 256
         self.push('227 entering passive mode (%s,%d,%d)' %(ip, p1, p2))
         conn, addr = sock.accept()
         self.dtp = self.dtp_handler(conn, baseclass=self)

Lib/test/test_functools.py

@@ -116,7 +116,7 @@ def test_no_side_effects(self):
 
     def test_error_propagation(self):
         def f(x, y):
-            x // y
+            x / y
         self.assertRaises(ZeroDivisionError, self.thetype(f, 1, 0))
         self.assertRaises(ZeroDivisionError, self.thetype(f, 1), 0)
         self.assertRaises(ZeroDivisionError, self.thetype(f), 1, 0)

Lib/test/test_grammar.py

@@ -11,7 +11,6 @@
 from test.test_support import run_unittest, check_syntax_error
 import unittest
 import sys
-import warnings
 # testing import *
 from sys import *
 
@@ -153,9 +152,8 @@ def f1(): pass
         f1(*(), **{})
         def f2(one_argument): pass
         def f3(two, arguments): pass
-        # Silence Py3k warning
+        def f4(two, (compound, (argument, list))): pass
-        exec('def f4(two, (compound, (argument, list))): pass')
+        def f5((compound, first), two): pass
-        exec('def f5((compound, first), two): pass')
         self.assertEquals(f2.func_code.co_varnames, ('one_argument',))
         self.assertEquals(f3.func_code.co_varnames, ('two', 'arguments'))
         if sys.platform.startswith('java'):
@@ -174,8 +172,7 @@ def a2(two, args,): pass
         def v0(*rest): pass
         def v1(a, *rest): pass
         def v2(a, b, *rest): pass
-        # Silence Py3k warning
+        def v3(a, (b, c), *rest): return a, b, c, rest
-        exec('def v3(a, (b, c), *rest): return a, b, c, rest')
 
         f1()
         f2(1)
@@ -280,10 +277,9 @@ def d22v(a, b, c=1, d=2, *rest): pass
         d22v(*(1, 2, 3, 4))
         d22v(1, 2, *(3, 4, 5))
         d22v(1, *(2, 3), **{'d': 4})
-        # Silence Py3k warning
+        def d31v((x)): pass
-        exec('def d31v((x)): pass')
-        exec('def d32v((x,)): pass')
         d31v(1)
+        def d32v((x,)): pass
         d32v((1,))
 
         # keyword arguments after *arglist
@@ -478,7 +474,7 @@ def test_inner(extra_burning_oil = 1, count=0):
                     continue
                 except:
                     raise
-            if count > 2 or big_hippo != 1:
+            if count > 2 or big_hippo <> 1:
                 self.fail("continue then break in try/except in loop broken!")
         test_inner()
 
@@ -681,6 +677,7 @@ def testComparison(self):
         x = (1 == 1)
         if 1 == 1: pass
         if 1 != 1: pass
+        if 1 <> 1: pass
         if 1 < 1: pass
         if 1 > 1: pass
         if 1 <= 1: pass
@@ -689,10 +686,7 @@ def testComparison(self):
         if 1 is not 1: pass
         if 1 in (): pass
         if 1 not in (): pass
-        if 1 < 1 > 1 == 1 >= 1 <= 1 != 1 in 1 not in 1 is 1 is not 1: pass
+        if 1 < 1 > 1 == 1 >= 1 <= 1 <> 1 != 1 in 1 not in 1 is 1 is not 1: pass
-        # Silence Py3k warning
-        if eval('1 <> 1'): pass
-        if eval('1 < 1 > 1 == 1 >= 1 <= 1 <> 1 != 1 in 1 not in 1 is 1 is not 1'): pass
 
     def testBinaryMaskOps(self):
         x = 1 & 1
@@ -775,10 +769,9 @@ def testAtoms(self):
         x = {'one': 1, 'two': 2,}
         x = {'one': 1, 'two': 2, 'three': 3, 'four': 4, 'five': 5, 'six': 6}
 
-        # Silence Py3k warning
+        x = `x`
-        x = eval('`x`')
+        x = `1 or 2 or 3`
-        x = eval('`1 or 2 or 3`')
+        self.assertEqual(`1,2`, '(1, 2)')
-        self.assertEqual(eval('`1,2`'), '(1, 2)')
 
         x = x
         x = 'x'
@@ -983,19 +976,7 @@ def test_paren_evaluation(self):
 
 
 def test_main():
-    with warnings.catch_warnings():
+    run_unittest(TokenTests, GrammarTests)
-        # Silence Py3k warnings
-        warnings.filterwarnings("ignore", "backquote not supported",
-                                SyntaxWarning)
-        warnings.filterwarnings("ignore", "tuple parameter unpacking has been removed",
-                                SyntaxWarning)
-        warnings.filterwarnings("ignore", "parenthesized argument names are invalid",
-                                SyntaxWarning)
-        warnings.filterwarnings("ignore", "classic int division",
-                                DeprecationWarning)
-        warnings.filterwarnings("ignore", ".+ not supported in 3.x",
-                                DeprecationWarning)
-        run_unittest(TokenTests, GrammarTests)
 
 if __name__ == '__main__':
     test_main()

Lib/test/test_gzip.py

@@ -246,11 +246,11 @@ def test_with_open(self):
             self.fail("__enter__ on a closed file didn't raise an exception")
         try:
             with gzip.GzipFile(self.filename, "wb") as f:
-                1 // 0
+                1/0
         except ZeroDivisionError:
             pass
         else:
-            self.fail("1 // 0 didn't raise an exception")
+            self.fail("1/0 didn't raise an exception")
 
 def test_main(verbose=None):
     test_support.run_unittest(TestGzip)

Lib/test/test_heapq.py

@@ -356,8 +356,7 @@ def test_iterable_args(self):
         for f in (self.module.nlargest, self.module.nsmallest):
             for s in ("123", "", range(1000), ('do', 1.2), xrange(2000,2200,5)):
                 for g in (G, I, Ig, L, R):
-                    with test_support.check_warnings():
+                    self.assertEqual(f(2, g(s)), f(2,s))
-                        self.assertEqual(f(2, g(s)), f(2,s))
                 self.assertEqual(f(2, S(s)), [])
                 self.assertRaises(TypeError, f, 2, X(s))
                 self.assertRaises(TypeError, f, 2, N(s))

Lib/test/test_hotshot.py

@@ -1,3 +1,5 @@
+import hotshot
+import hotshot.log
 import os
 import pprint
 import unittest
@@ -7,8 +9,6 @@
 
 from test import test_support
 
-# Silence Py3k warning
-hotshot = test_support.import_module('hotshot', deprecated=True)
 from hotshot.log import ENTER, EXIT, LINE
 
 

Lib/test/test_import.py

@@ -7,7 +7,6 @@
 import py_compile
 import warnings
 import marshal
-from imp import reload
 from test.test_support import (unlink, TESTFN, unload, run_unittest,
     check_warnings, TestFailed, EnvironmentVarGuard)
 
@@ -57,10 +56,11 @@ def test_with_extension(ext):
             f.close()
 
             try:
-                mod = __import__(TESTFN)
+                try:
-            except ImportError, err:
+                    mod = __import__(TESTFN)
-                self.fail("import from %s failed: %s" % (ext, err))
+                except ImportError, err:
-            else:
+                    self.fail("import from %s failed: %s" % (ext, err))
+
                 self.assertEquals(mod.a, a,
                     "module loaded (%s) but contents invalid" % mod)
                 self.assertEquals(mod.b, b,
@@ -69,9 +69,10 @@ def test_with_extension(ext):
                 os.unlink(source)
 
             try:
-                reload(mod)
+                try:
-            except ImportError, err:
+                    reload(mod)
-                self.fail("import from .pyc/.pyo failed: %s" % err)
+                except ImportError, err:
+                    self.fail("import from .pyc/.pyo failed: %s" % err)
             finally:
                 try:
                     os.unlink(pyc)
@@ -171,7 +172,7 @@ def test_module_with_large_stack(self, module='longlist'):
     def test_failing_import_sticks(self):
         source = TESTFN + os.extsep + "py"
         f = open(source, "w")
-        print >> f, "a = 1 // 0"
+        print >> f, "a = 1/0"
         f.close()
 
         # New in 2.4, we shouldn't be able to import that no matter how often

Lib/test/test_importhooks.py

@@ -180,7 +180,7 @@ def doTestImports(self, importer=None):
         self.assertFalse(hasattr(reloadmodule,'reloaded'))
 
         TestImporter.modules['reloadmodule'] = (False, reload_co)
-        imp.reload(reloadmodule)
+        reload(reloadmodule)
         self.assertTrue(hasattr(reloadmodule,'reloaded'))
 
         import hooktestpackage.oldabs
@@ -247,11 +247,9 @@ def testImpWrapper(self):
             for n in sys.modules.keys():
                 if n.startswith(parent):
                     del sys.modules[n]
-        # Silence Py3k warning
+        for mname in mnames:
-        with test_support.check_warnings():
+            m = __import__(mname, globals(), locals(), ["__dummy__"])
-            for mname in mnames:
+            m.__loader__  # to make sure we actually handled the import
-                m = __import__(mname, globals(), locals(), ["__dummy__"])
-                m.__loader__  # to make sure we actually handled the import
 
 
 def test_main():

Lib/test/test_inspect.py

@@ -4,11 +4,10 @@
 import inspect
 import datetime
 
-from test.test_support import TESTFN, run_unittest, check_warnings
+from test.test_support import TESTFN, run_unittest
 
-with check_warnings():
+from test import inspect_fodder as mod
-    from test import inspect_fodder as mod
+from test import inspect_fodder2 as mod2
-    from test import inspect_fodder2 as mod2
 
 # C module for test_findsource_binary
 import unicodedata
@@ -30,7 +29,7 @@
 import __builtin__
 
 try:
-    1 // 0
+    1/0
 except:
     tb = sys.exc_traceback
 
@@ -168,7 +167,7 @@ def test_trace(self):
         self.assertEqual(git.tr[1][1:], (modfile, 9, 'spam',
                                          ['    eggs(b + d, c + f)\n'], 0))
         self.assertEqual(git.tr[2][1:], (modfile, 18, 'eggs',
-                                         ['    q = y // 0\n'], 0))
+                                         ['    q = y / 0\n'], 0))
 
     def test_frame(self):
         args, varargs, varkw, locals = inspect.getargvalues(mod.fr)
@@ -419,13 +418,11 @@ def m(self):
         self.assertArgSpecEquals(A.m, ['self'])
 
     def test_getargspec_sublistofone(self):
-        # Silence Py3k warning
+        def sublistOfOne((foo,)): return 1
-        with check_warnings():
+        self.assertArgSpecEquals(sublistOfOne, [['foo']])
-            exec 'def sublistOfOne((foo,)): return 1'
-            self.assertArgSpecEquals(sublistOfOne, [['foo']])
 
-            exec 'def fakeSublistOfOne((foo)): return 1'
+        def fakeSublistOfOne((foo)): return 1
-            self.assertArgSpecEquals(fakeSublistOfOne, ['foo'])
+        self.assertArgSpecEquals(fakeSublistOfOne, ['foo'])
 
     def test_classify_oldstyle(self):
         class A:

Lib/test/test_io.py

@@ -381,11 +381,11 @@ def test_with_open(self):
             f = None
             try:
                 with self.open(support.TESTFN, "wb", bufsize) as f:
-                    1 // 0
+                    1/0
             except ZeroDivisionError:
                 self.assertEqual(f.closed, True)
             else:
-                self.fail("1 // 0 didn't raise an exception")
+                self.fail("1/0 didn't raise an exception")
 
     # issue 5008
     def test_append_mode_tell(self):

Lib/test/test_iter.py

@@ -1,8 +1,7 @@
 # Test iterators.
 
 import unittest
-from test.test_support import run_unittest, TESTFN, unlink, have_unicode, \
+from test.test_support import run_unittest, TESTFN, unlink, have_unicode
-                              check_warnings
 
 # Test result of triple loop (too big to inline)
 TRIPLETS = [(0, 0, 0), (0, 0, 1), (0, 0, 2),
@@ -396,12 +395,7 @@ def test_builtin_max_min(self):
                 pass
 
     # Test map()'s use of iterators.
-    def test_deprecated_builtin_map(self):
+    def test_builtin_map(self):
-        # Silence Py3k warning
-        with check_warnings():
-            self._test_builtin_map()
-
-    def _test_builtin_map(self):
         self.assertEqual(map(None, SequenceClass(5)), range(5))
         self.assertEqual(map(lambda x: x+1, SequenceClass(5)), range(1, 6))
 
@@ -512,12 +506,7 @@ def __len__(self):
                 self.assertEqual(zip(x, y), expected)
 
     # Test reduces()'s use of iterators.
-    def test_deprecated_builtin_reduce(self):
+    def test_builtin_reduce(self):
-        # Silence Py3k warning
-        with check_warnings():
-            self._test_builtin_reduce()
-
-    def _test_builtin_reduce(self):
         from operator import add
         self.assertEqual(reduce(add, SequenceClass(5)), 10)
         self.assertEqual(reduce(add, SequenceClass(5), 42), 52)

Lib/test/test_itertools.py

@@ -9,7 +9,6 @@
 import random
 import copy
 import pickle
-from functools import reduce
 maxsize = test_support.MAX_Py_ssize_t
 minsize = -maxsize-1
 
@@ -123,7 +122,7 @@ def combinations3(iterable, r):
             values = [5*x-12 for x in range(n)]
             for r in range(n+2):
                 result = list(combinations(values, r))
-                self.assertEqual(len(result), 0 if r>n else fact(n) // fact(r) // fact(n-r)) # right number of combs
+                self.assertEqual(len(result), 0 if r>n else fact(n) / fact(r) / fact(n-r)) # right number of combs
                 self.assertEqual(len(result), len(set(result)))         # no repeats
                 self.assertEqual(result, sorted(result))                # lexicographic order
                 for c in result:
@@ -179,7 +178,7 @@ def cwr2(iterable, r):
         def numcombs(n, r):
             if not n:
                 return 0 if r else 1
-            return fact(n+r-1) // fact(r) // fact(n-1)
+            return fact(n+r-1) / fact(r)/ fact(n-1)
 
         for n in range(7):
             values = [5*x-12 for x in range(n)]
@@ -258,7 +257,7 @@ def permutations2(iterable, r=None):
             values = [5*x-12 for x in range(n)]
             for r in range(n+2):
                 result = list(permutations(values, r))
-                self.assertEqual(len(result), 0 if r>n else fact(n) // fact(n-r))      # right number of perms
+                self.assertEqual(len(result), 0 if r>n else fact(n) / fact(n-r))      # right number of perms
                 self.assertEqual(len(result), len(set(result)))         # no repeats
                 self.assertEqual(result, sorted(result))                # lexicographic order
                 for p in result:
@@ -289,9 +288,9 @@ def test_combinatorics(self):
 
                 # Check size
                 self.assertEquals(len(prod), n**r)
-                self.assertEquals(len(cwr), (fact(n+r-1) // fact(r) // fact(n-1)) if n else (not r))
+                self.assertEquals(len(cwr), (fact(n+r-1) / fact(r)/ fact(n-1)) if n else (not r))
-                self.assertEquals(len(perm), 0 if r>n else fact(n) // fact(n-r))
+                self.assertEquals(len(perm), 0 if r>n else fact(n) / fact(n-r))
-                self.assertEquals(len(comb), 0 if r>n else fact(n) // fact(r) // fact(n-r))
+                self.assertEquals(len(comb), 0 if r>n else fact(n) / fact(r) / fact(n-r))
 
                 # Check lexicographic order without repeated tuples
                 self.assertEquals(prod, sorted(set(prod)))
@@ -544,8 +543,7 @@ def test_iziplongest(self):
                 [range(1000), range(0), range(3000,3050), range(1200), range(1500)],
                 [range(1000), range(0), range(3000,3050), range(1200), range(1500), range(0)],
             ]:
-            target = [tuple([arg[i] if i < len(arg) else None for arg in args])
+            target = map(None, *args)
-                      for i in range(max(map(len, args)))]
             self.assertEqual(list(izip_longest(*args)), target)
             self.assertEqual(list(izip_longest(*args, **{})), target)
             target = [tuple((e is None and 'X' or e) for e in t) for t in target]   # Replace None fills with 'X'
@@ -557,8 +555,7 @@ def test_iziplongest(self):
         self.assertEqual(list(izip_longest([])), zip([]))
         self.assertEqual(list(izip_longest('abcdef')), zip('abcdef'))
 
-        self.assertEqual(list(izip_longest('abc', 'defg', **{})),
+        self.assertEqual(list(izip_longest('abc', 'defg', **{})), map(None, 'abc', 'defg')) # empty keyword dict
-                         zip(list('abc') + [None], 'defg'))  # empty keyword dict
         self.assertRaises(TypeError, izip_longest, 3)
         self.assertRaises(TypeError, izip_longest, range(3), 3)
 
@@ -1434,7 +1431,7 @@ def __init__(self, newarg=None, *args):
 # is differencing with a range so that consecutive numbers all appear in
 # same group.
 >>> data = [ 1,  4,5,6, 10, 15,16,17,18, 22, 25,26,27,28]
->>> for k, g in groupby(enumerate(data), lambda t:t[0]-t[1]):
+>>> for k, g in groupby(enumerate(data), lambda (i,x):i-x):
 ...     print map(operator.itemgetter(1), g)
 ...
 [1]

Lib/test/test_json.py

@@ -7,15 +7,10 @@
 
 import json.tests
 import test.test_support
-import warnings
 
 
 def test_main():
-    with warnings.catch_warnings():
+    test.test_support.run_unittest(json.tests.test_suite())
-        # Silence Py3k warning
-        warnings.filterwarnings("ignore", "comparing unequal types "
-                                "not supported", DeprecationWarning)
-        test.test_support.run_unittest(json.tests.test_suite())
 
 
 if __name__ == "__main__":

Lib/test/test_linuxaudiodev.py

@@ -4,13 +4,12 @@
 from test.test_support import findfile, run_unittest
 
 import errno
+linuxaudiodev = test_support.import_module('linuxaudiodev', deprecated=True)
 import sys
+import sunaudio
 import audioop
 import unittest
 
-linuxaudiodev = test_support.import_module('linuxaudiodev', deprecated=True)
-sunaudio = test_support.import_module('sunaudio', deprecated=True)
-
 SND_FORMAT_MULAW_8 = 1
 
 class LinuxAudioDevTests(unittest.TestCase):

Lib/test/test_long.py

@@ -575,13 +575,11 @@ class X(object):
             def __getslice__(self, i, j):
                 return i, j
 
-        # Silence Py3k warning
+        self.assertEqual(X()[-5L:7L], (-5, 7))
-        with test_support.check_warnings():
+        # use the clamping effect to test the smallest and largest longs
-            self.assertEqual(X()[-5L:7L], (-5, 7))
+        # that fit a Py_ssize_t
-            # use the clamping effect to test the smallest and largest longs
+        slicemin, slicemax = X()[-2L**100:2L**100]
-            # that fit a Py_ssize_t
+        self.assertEqual(X()[slicemin:slicemax], (slicemin, slicemax))
-            slicemin, slicemax = X()[-2L**100:2L**100]
-            self.assertEqual(X()[slicemin:slicemax], (slicemin, slicemax))
 
 # ----------------------------------- tests of auto int->long conversion
 
@@ -621,10 +619,8 @@ def checkit(*args):
                 checkit(x, '*', y)
 
                 if y:
-                    # Silence Py3k warning
+                    expected = longx / longy
-                    with test_support.check_warnings():
+                    got = x / y
-                        expected = longx / longy
-                        got = x / y
                     checkit(x, '/', y)
 
                     expected = longx // longy

Lib/test/test_mailbox.py

@@ -5,6 +5,7 @@
 import socket
 import email
 import email.message
+import rfc822
 import re
 import StringIO
 from test import test_support
@@ -16,8 +17,6 @@
 except ImportError:
     pass
 
-# Silence Py3k warning
-rfc822 = test_support.import_module('rfc822')
 
 class TestBase(unittest.TestCase):
 

Lib/test/test_marshal.py

@@ -129,9 +129,7 @@ def test_string(self):
 
     def test_buffer(self):
         for s in ["", "Andrè Previn", "abc", " "*10000]:
-            # Silence Py3k warning
+            b = buffer(s)
-            with test_support.check_warnings():
-                b = buffer(s)
             new = marshal.loads(marshal.dumps(b))
             self.assertEqual(s, new)
             marshal.dump(b, file(test_support.TESTFN, "wb"))

Lib/test/test_multibytecodec_support.py

@@ -307,7 +307,7 @@ def _test_mapping_file_plain(self):
                 continue
 
             unich = unichrs(data[1])
-            if ord(unich) == 0xfffd or unich in urt_wa:
+            if ord(unich) == 0xfffd or urt_wa.has_key(unich):
                 continue
             urt_wa[unich] = csetch
 

Lib/test/test_multifile.py

@@ -1,5 +1,5 @@
 from test import test_support
-mimetools = test_support.import_module("mimetools", deprecated=True)
+import mimetools
 multifile = test_support.import_module('multifile', deprecated=True)
 import cStringIO
 

Lib/test/test_multiprocessing.py

@@ -19,7 +19,6 @@
 import logging
 from test import test_support
 from StringIO import StringIO
-import warnings
 
 
 _multiprocessing = test_support.import_module('_multiprocessing')
@@ -1992,11 +1991,7 @@ def test_main(run=None):
 
     loadTestsFromTestCase = unittest.defaultTestLoader.loadTestsFromTestCase
     suite = unittest.TestSuite(loadTestsFromTestCase(tc) for tc in testcases)
-    with warnings.catch_warnings():
+    run(suite)
-        # Silence Py3k warnings
-        warnings.filterwarnings("ignore", ".+slice__ has been removed",
-                                DeprecationWarning)
-        run(suite)
 
     ThreadsMixin.pool.terminate()
     ProcessesMixin.pool.terminate()

Lib/test/test_mutants.py

@@ -210,7 +210,7 @@ def __repr__(self):
         # Tim sez:  "luck of the draw; crashes with or without for me."
         print >> f
 
-        return repr("machiavelli")
+        return `"machiavelli"`
 
     def __hash__(self):
         return 0

Lib/test/test_opcodes.py

@@ -2,7 +2,6 @@
 
 from test.test_support import run_unittest
 import unittest
-import warnings
 
 class OpcodeTest(unittest.TestCase):
 
@@ -10,7 +9,7 @@ def test_try_inside_for_loop(self):
         n = 0
         for i in range(10):
             n = n+i
-            try: 1 // 0
+            try: 1/0
             except NameError: pass
             except ZeroDivisionError: pass
             except TypeError: pass
@@ -111,14 +110,7 @@ def __mod__(self, value):
 
 
 def test_main():
-    with warnings.catch_warnings():
+    run_unittest(OpcodeTest)
-        # Silence Py3k warning
-        warnings.filterwarnings("ignore", "exceptions must derive from "
-                                "BaseException", DeprecationWarning)
-        warnings.filterwarnings("ignore", "catching classes that don't "
-                                "inherit from BaseException is not allowed",
-                                DeprecationWarning)
-        run_unittest(OpcodeTest)
 
 if __name__ == '__main__':
     test_main()

Lib/test/test_operator.py

@@ -192,12 +192,11 @@ def test_isCallable(self):
         class C:
             pass
         def check(self, o, v):
-            with test_support.check_warnings():
+            self.assertTrue(operator.isCallable(o) == callable(o) == v)
-                self.assertTrue(operator.isCallable(o) == callable(o) == v)
+        check(self, 4, 0)
-        check(self, 4, False)
+        check(self, operator.isCallable, 1)
-        check(self, operator.isCallable, True)
+        check(self, C, 1)
-        check(self, C, True)
+        check(self, C(), 0)
-        check(self, C(), False)
 
     def test_isMappingType(self):
         self.assertRaises(TypeError, operator.isMappingType)
@@ -307,10 +306,8 @@ def test_contains(self):
         self.assertRaises(TypeError, operator.contains, None, None)
         self.assertTrue(operator.contains(range(4), 2))
         self.assertFalse(operator.contains(range(4), 5))
-        # Silence Py3k warning
+        self.assertTrue(operator.sequenceIncludes(range(4), 2))
-        with test_support.check_warnings():
+        self.assertFalse(operator.sequenceIncludes(range(4), 5))
-            self.assertTrue(operator.sequenceIncludes(range(4), 2))
-            self.assertFalse(operator.sequenceIncludes(range(4), 5))
 
     def test_setitem(self):
         a = range(3)

Lib/test/test_optparse.py

@@ -26,6 +26,12 @@
 from optparse import _match_abbrev
 from optparse import _parse_num
 
+# Do the right thing with boolean values for all known Python versions.
+try:
+    True, False
+except NameError:
+    (True, False) = (1, 0)
+
 retype = type(re.compile(''))
 
 class InterceptedError(Exception):

Lib/test/test_ossaudiodev.py

@@ -71,7 +71,7 @@ def play_sound_file(self, data, rate, ssize, nchannels):
                 self.fail("dsp.%s not read-only" % attr)
 
         # Compute expected running time of sound sample (in seconds).
-        expected_time = float(len(data)) / (ssize//8) / nchannels / rate
+        expected_time = float(len(data)) / (ssize/8) / nchannels / rate
 
         # set parameters based on .au file headers
         dsp.setparameters(AFMT_S16_NE, nchannels, rate)

Lib/test/test_peepholer.py

@@ -205,24 +205,18 @@ def f(cond1, cond2):
 def test_main(verbose=None):
     import sys
     from test import test_support
-    import warnings
     test_classes = (TestTranforms,)
+    test_support.run_unittest(*test_classes)
 
-    with warnings.catch_warnings():
+    # verify reference counting
-        # Silence Py3k warning
+    if verbose and hasattr(sys, "gettotalrefcount"):
-        warnings.filterwarnings("ignore", "backquote not supported",
+        import gc
-                                SyntaxWarning)
+        counts = [None] * 5
-        test_support.run_unittest(*test_classes)
+        for i in xrange(len(counts)):
-
+            test_support.run_unittest(*test_classes)
-        # verify reference counting
+            gc.collect()
-        if verbose and hasattr(sys, "gettotalrefcount"):
+            counts[i] = sys.gettotalrefcount()
-            import gc
+        print counts
-            counts = [None] * 5
-            for i in xrange(len(counts)):
-                test_support.run_unittest(*test_classes)
-                gc.collect()
-                counts[i] = sys.gettotalrefcount()
-            print counts
 
 if __name__ == "__main__":
     test_main(verbose=True)

Lib/test/test_pep352.py

@@ -6,23 +6,12 @@
 import os
 from platform import system as platform_system
 
-DEPRECATION_WARNINGS = (
+def ignore_message_warning():
-    "BaseException.message has been deprecated",
+    """Ignore the DeprecationWarning for BaseException.message."""
-    "exceptions must derive from BaseException",
+    warnings.resetwarnings()
-    "catching classes that don't inherit from BaseException is not allowed",
+    warnings.filterwarnings("ignore", "BaseException.message",
-    "__getitem__ not supported for exception classes",
+                            DeprecationWarning)
-)
 
-# Silence Py3k and other deprecation warnings
-def ignore_deprecation_warnings(func):
-    """Ignore the known DeprecationWarnings."""
-    def wrapper(*args, **kw):
-        with warnings.catch_warnings():
-            warnings.resetwarnings()
-            for text in DEPRECATION_WARNINGS:
-                warnings.filterwarnings("ignore", text, DeprecationWarning)
-            return func(*args, **kw)
-    return wrapper
 
 class ExceptionClassTests(unittest.TestCase):
 
@@ -32,12 +21,14 @@ class ExceptionClassTests(unittest.TestCase):
     def test_builtins_new_style(self):
         self.assertTrue(issubclass(Exception, object))
 
-    @ignore_deprecation_warnings
     def verify_instance_interface(self, ins):
-        for attr in ("args", "message", "__str__", "__repr__", "__getitem__"):
+        with warnings.catch_warnings():
-            self.assertTrue(hasattr(ins, attr),
+            ignore_message_warning()
-                    "%s missing %s attribute" %
+            for attr in ("args", "message", "__str__", "__repr__",
-                        (ins.__class__.__name__, attr))
+                            "__getitem__"):
+                self.assertTrue(hasattr(ins, attr),
+                        "%s missing %s attribute" %
+                            (ins.__class__.__name__, attr))
 
     def test_inheritance(self):
         # Make sure the inheritance hierarchy matches the documentation
@@ -100,39 +91,43 @@ def interface_test_driver(self, results):
             self.assertEqual(given, expected, "%s: %s != %s" % (test_name,
                 given, expected))
 
-    @ignore_deprecation_warnings
     def test_interface_single_arg(self):
         # Make sure interface works properly when given a single argument
         arg = "spam"
         exc = Exception(arg)
-        results = ([len(exc.args), 1], [exc.args[0], arg], [exc.message, arg],
+        with warnings.catch_warnings():
-                   [str(exc), str(arg)], [unicode(exc), unicode(arg)],
+            ignore_message_warning()
-                   [repr(exc), exc.__class__.__name__ + repr(exc.args)],
+            results = ([len(exc.args), 1], [exc.args[0], arg],
-                   [exc[0], arg])
+                    [exc.message, arg],
-        self.interface_test_driver(results)
+                    [str(exc), str(arg)], [unicode(exc), unicode(arg)],
+                [repr(exc), exc.__class__.__name__ + repr(exc.args)], [exc[0],
+                arg])
+            self.interface_test_driver(results)
 
-    @ignore_deprecation_warnings
     def test_interface_multi_arg(self):
         # Make sure interface correct when multiple arguments given
         arg_count = 3
         args = tuple(range(arg_count))
         exc = Exception(*args)
-        results = ([len(exc.args), arg_count], [exc.args, args],
+        with warnings.catch_warnings():
-                   [exc.message, ''], [str(exc), str(args)],
+            ignore_message_warning()
-                   [unicode(exc), unicode(args)],
+            results = ([len(exc.args), arg_count], [exc.args, args],
-                   [repr(exc), exc.__class__.__name__ + repr(exc.args)],
+                    [exc.message, ''], [str(exc), str(args)],
-                   [exc[-1], args[-1]])
+                    [unicode(exc), unicode(args)],
-        self.interface_test_driver(results)
+                    [repr(exc), exc.__class__.__name__ + repr(exc.args)],
+                    [exc[-1], args[-1]])
+            self.interface_test_driver(results)
 
-    @ignore_deprecation_warnings
     def test_interface_no_arg(self):
         # Make sure that with no args that interface is correct
         exc = Exception()
-        results = ([len(exc.args), 0], [exc.args, tuple()],
+        with warnings.catch_warnings():
-                   [exc.message, ''],
+            ignore_message_warning()
-                   [str(exc), ''], [unicode(exc), u''],
+            results = ([len(exc.args), 0], [exc.args, tuple()],
-                   [repr(exc), exc.__class__.__name__ + '()'], [True, True])
+                    [exc.message, ''],
-        self.interface_test_driver(results)
+                    [str(exc), ''], [unicode(exc), u''],
+                    [repr(exc), exc.__class__.__name__ + '()'], [True, True])
+            self.interface_test_driver(results)
 
 
     def test_message_deprecation(self):
@@ -184,7 +179,6 @@ def catch_fails(self, object_):
             self.fail("TypeError expected when catching %s as specified in a "
                         "tuple" % type(object_))
 
-    @ignore_deprecation_warnings
     def test_raise_classic(self):
         # Raising a classic class is okay (for now).
         class ClassicClass:

Lib/test/test_pkgimport.py

@@ -6,14 +6,14 @@ class TestImport(unittest.TestCase):
 
     def __init__(self, *args, **kw):
         self.package_name = 'PACKAGE_'
-        while self.package_name in sys.modules:
+        while sys.modules.has_key(self.package_name):
             self.package_name += random.choose(string.letters)
         self.module_name = self.package_name + '.foo'
         unittest.TestCase.__init__(self, *args, **kw)
 
     def remove_modules(self):
         for module_name in (self.package_name, self.module_name):
-            if module_name in sys.modules:
+            if sys.modules.has_key(module_name):
                 del sys.modules[module_name]
 
     def setUp(self):
@@ -52,7 +52,7 @@ def test_package_import__semantics(self):
         try: __import__(self.module_name)
         except SyntaxError: pass
         else: raise RuntimeError, 'Failed to induce SyntaxError'
-        self.assertTrue(self.module_name not in sys.modules and
+        self.assertTrue(not sys.modules.has_key(self.module_name) and
                      not hasattr(sys.modules[self.package_name], 'foo'))
 
         # ...make up a variable name that isn't bound in __builtins__

Lib/test/test_pyclbr.py

@@ -2,7 +2,7 @@
    Test cases for pyclbr.py
    Nick Mathewson
 '''
-from test.test_support import run_unittest, import_module
+from test.test_support import run_unittest
 import sys
 from types import ClassType, FunctionType, MethodType, BuiltinFunctionType
 import pyclbr
@@ -13,8 +13,6 @@
 
 # This next line triggers an error on old versions of pyclbr.
 
-# Silence Py3k warning
-import_module('commands', deprecated=True)
 from commands import getstatus
 
 # Here we test the python class browser code.
@@ -42,11 +40,11 @@ def assertHasattr(self, obj, attr, ignore):
 
 
     def assertHaskey(self, obj, key, ignore):
-        ''' succeed iff key in obj or key in ignore. '''
+        ''' succeed iff obj.has_key(key) or key in ignore. '''
         if key in ignore: return
-        if key not in obj:
+        if not obj.has_key(key):
-            print >>sys.stderr, "***", key
+            print >>sys.stderr, "***",key
-        self.assertTrue(key in obj)
+        self.assertTrue(obj.has_key(key))
 
     def assertEqualsOrIgnored(self, a, b, ignore):
         ''' succeed iff a == b or a in ignore or b in ignore '''
@@ -151,9 +149,7 @@ def defined_in(item, module):
     def test_easy(self):
         self.checkModule('pyclbr')
         self.checkModule('doctest', ignore=("DocTestCase",))
-        # Silence Py3k warning
+        self.checkModule('rfc822')
-        rfc822 = import_module('rfc822', deprecated=True)
-        self.checkModule('rfc822', rfc822)
         self.checkModule('difflib')
 
     def test_decorators(self):

Lib/test/test_pyexpat.py

@@ -554,7 +554,7 @@ def test_change_size_2(self):
 
         self.n=0
         parser.Parse(xml1, 0)
-        parser.buffer_size //= 2
+        parser.buffer_size /= 2
         self.assertEquals(parser.buffer_size, 1024)
         parser.Parse(xml2, 1)
         self.assertEquals(self.n, 4)

Lib/test/test_queue.py

@@ -7,8 +7,7 @@
 import unittest
 from test import test_support
 
-QUEUE_SIZE = LAST = 5
+QUEUE_SIZE = 5
-FULL = LAST+1
 
 # A thread to run a function that unclogs a blocked Queue.
 class _TriggerThread(threading.Thread):
@@ -103,21 +102,21 @@ def simple_queue_test(self, q):
             q.put(i)
             self.assertTrue(not q.empty(), "Queue should not be empty")
         self.assertTrue(not q.full(), "Queue should not be full")
-        q.put(LAST)
+        q.put("last")
         self.assertTrue(q.full(), "Queue should be full")
         try:
-            q.put(FULL, block=0)
+            q.put("full", block=0)
             self.fail("Didn't appear to block with a full queue")
         except Queue.Full:
             pass
         try:
-            q.put(FULL, timeout=0.01)
+            q.put("full", timeout=0.01)
             self.fail("Didn't appear to time-out with a full queue")
         except Queue.Full:
             pass
         # Test a blocking put
-        self.do_blocking_test(q.put, (FULL,), q.get, ())
+        self.do_blocking_test(q.put, ("full",), q.get, ())
-        self.do_blocking_test(q.put, (FULL, True, 10), q.get, ())
+        self.do_blocking_test(q.put, ("full", True, 10), q.get, ())
         # Empty it
         for i in range(QUEUE_SIZE):
             q.get()

Lib/test/test_random.py

@@ -6,7 +6,6 @@
 import pickle
 import warnings
 from math import log, exp, sqrt, pi, fsum, sin
-from functools import reduce
 from test import test_support
 
 class TestBasicOps(unittest.TestCase):

Lib/test/test_repr.py

@@ -8,7 +8,7 @@
 import shutil
 import unittest
 
-from test.test_support import run_unittest, check_warnings
+from test.test_support import run_unittest
 from repr import repr as r # Don't shadow builtin repr
 from repr import Repr
 
@@ -174,9 +174,7 @@ def test_nesting(self):
     def test_buffer(self):
         # XXX doesn't test buffers with no b_base or read-write buffers (see
         # bufferobject.c).  The test is fairly incomplete too.  Sigh.
-        # Silence the Py3k warning
+        x = buffer('foo')
-        with check_warnings():
-            x = buffer('foo')
         self.assertTrue(repr(x).startswith('<read-only buffer for 0x'))
 
     def test_cell(self):

Lib/test/test_rfc822.py

@@ -46,9 +46,9 @@ def check(self, msg, results):
                 continue
             i = i + 1
             self.assertEqual(mn, n,
-                             "Un-expected name: %r != %r" % (mn, n))
+                             "Un-expected name: %s != %s" % (`mn`, `n`))
             self.assertEqual(ma, a,
-                             "Un-expected address: %r != %r" % (ma, a))
+                             "Un-expected address: %s != %s" % (`ma`, `a`))
             if mn == n and ma == a:
                 pass
             else:

Lib/test/test_richcmp.py

@@ -2,7 +2,6 @@
 
 import unittest
 from test import test_support
-import warnings
 
 import operator
 
@@ -331,13 +330,7 @@ def __lt__(self, other):
             self.assertIs(op(x, y), True)
 
 def test_main():
-    test_support.run_unittest(VectorTest, NumberTest, MiscTest, ListTest)
+    test_support.run_unittest(VectorTest, NumberTest, MiscTest, DictTest, ListTest)
-    with warnings.catch_warnings():
-        # Silence Py3k warning
-        warnings.filterwarnings("ignore", "dict inequality comparisons "
-                                "not supported in 3.x", DeprecationWarning)
-        test_support.run_unittest(DictTest)
-
 
 if __name__ == "__main__":
     test_main()

Lib/test/test_scope.py

@@ -321,16 +321,10 @@ def returner():
 
         self.assertEqual(makeReturner2(a=11)()['a'], 11)
 
-        with warnings.catch_warnings():
+        def makeAddPair((a, b)):
-            # Silence Py3k warning
+            def addPair((c, d)):
-            warnings.filterwarnings("ignore", "tuple parameter unpacking "
+                return (a + c, b + d)
-                                    "has been removed", SyntaxWarning)
+            return addPair
-            exec """\
-def makeAddPair((a, b)):
-    def addPair((c, d)):
-        return (a + c, b + d)
-    return addPair
-""" in locals()
 
         self.assertEqual(makeAddPair((1, 2))((100, 200)), (101,202))
 
@@ -477,7 +471,7 @@ def h(z):
             return g
 
         d = f(2)(4)
-        self.assertTrue('h' in d)
+        self.assertTrue(d.has_key('h'))
         del d['h']
         self.assertEqual(d, {'x': 2, 'y': 7, 'w': 6})
 

Lib/test/test_set.py

@@ -1218,16 +1218,15 @@ def test_eq_ne(self):
         self.assertEqual(self.set != self.other, True)
 
     def test_ge_gt_le_lt(self):
-        with test_support.check_warnings():
+        self.assertRaises(TypeError, lambda: self.set < self.other)
-            self.assertRaises(TypeError, lambda: self.set < self.other)
+        self.assertRaises(TypeError, lambda: self.set <= self.other)
-            self.assertRaises(TypeError, lambda: self.set <= self.other)
+        self.assertRaises(TypeError, lambda: self.set > self.other)
-            self.assertRaises(TypeError, lambda: self.set > self.other)
+        self.assertRaises(TypeError, lambda: self.set >= self.other)
-            self.assertRaises(TypeError, lambda: self.set >= self.other)
 
-            self.assertRaises(TypeError, lambda: self.other < self.set)
+        self.assertRaises(TypeError, lambda: self.other < self.set)
-            self.assertRaises(TypeError, lambda: self.other <= self.set)
+        self.assertRaises(TypeError, lambda: self.other <= self.set)
-            self.assertRaises(TypeError, lambda: self.other > self.set)
+        self.assertRaises(TypeError, lambda: self.other > self.set)
-            self.assertRaises(TypeError, lambda: self.other >= self.set)
+        self.assertRaises(TypeError, lambda: self.other >= self.set)
 
     def test_update_operator(self):
         try:
@@ -1380,20 +1379,20 @@ class TestCopying(unittest.TestCase):
 
     def test_copy(self):
         dup = self.set.copy()
-        dup_list = list(dup)
+        dup_list = list(dup); dup_list.sort()
-        set_list = list(self.set)
+        set_list = list(self.set); set_list.sort()
         self.assertEqual(len(dup_list), len(set_list))
-        for elt in dup_list:
+        for i in range(len(dup_list)):
-            self.assertTrue(elt in set_list)
+            self.assertTrue(dup_list[i] is set_list[i])
 
     def test_deep_copy(self):
         dup = copy.deepcopy(self.set)
         ##print type(dup), repr(dup)
-        dup_list = list(dup)
+        dup_list = list(dup); dup_list.sort()
-        set_list = list(self.set)
+        set_list = list(self.set); set_list.sort()
         self.assertEqual(len(dup_list), len(set_list))
-        for elt in dup_list:
+        for i in range(len(dup_list)):
-            self.assertTrue(elt in set_list)
+            self.assertEqual(dup_list[i], set_list[i])
 
 #------------------------------------------------------------------------------
 
@@ -1553,7 +1552,7 @@ def test_constructor(self):
         for cons in (set, frozenset):
             for s in ("123", "", range(1000), ('do', 1.2), xrange(2000,2200,5)):
                 for g in (G, I, Ig, S, L, R):
-                    self.assertSameElements(cons(g(s)), g(s))
+                    self.assertEqual(sorted(cons(g(s))), sorted(g(s)))
                 self.assertRaises(TypeError, cons , X(s))
                 self.assertRaises(TypeError, cons , N(s))
                 self.assertRaises(ZeroDivisionError, cons , E(s))
@@ -1568,7 +1567,7 @@ def test_inline_methods(self):
                     if isinstance(expected, bool):
                         self.assertEqual(actual, expected)
                     else:
-                        self.assertSameElements(actual, expected)
+                        self.assertEqual(sorted(actual), sorted(expected))
                 self.assertRaises(TypeError, meth, X(s))
                 self.assertRaises(TypeError, meth, N(s))
                 self.assertRaises(ZeroDivisionError, meth, E(s))
@@ -1582,7 +1581,7 @@ def test_inplace_methods(self):
                     t = s.copy()
                     getattr(s, methname)(list(g(data)))
                     getattr(t, methname)(g(data))
-                    self.assertSameElements(s, t)
+                    self.assertEqual(sorted(s), sorted(t))
 
                 self.assertRaises(TypeError, getattr(set('january'), methname), X(data))
                 self.assertRaises(TypeError, getattr(set('january'), methname), N(data))

Lib/test/test_sets.py

@@ -510,17 +510,15 @@ def test_eq_ne(self):
         self.assertEqual(self.set != self.other, True)
 
     def test_ge_gt_le_lt(self):
-        # Silence Py3k warning
+        self.assertRaises(TypeError, lambda: self.set < self.other)
-        with test_support.check_warnings():
+        self.assertRaises(TypeError, lambda: self.set <= self.other)
-            self.assertRaises(TypeError, lambda: self.set < self.other)
+        self.assertRaises(TypeError, lambda: self.set > self.other)
-            self.assertRaises(TypeError, lambda: self.set <= self.other)
+        self.assertRaises(TypeError, lambda: self.set >= self.other)
-            self.assertRaises(TypeError, lambda: self.set > self.other)
-            self.assertRaises(TypeError, lambda: self.set >= self.other)
 
-            self.assertRaises(TypeError, lambda: self.other < self.set)
+        self.assertRaises(TypeError, lambda: self.other < self.set)
-            self.assertRaises(TypeError, lambda: self.other <= self.set)
+        self.assertRaises(TypeError, lambda: self.other <= self.set)
-            self.assertRaises(TypeError, lambda: self.other > self.set)
+        self.assertRaises(TypeError, lambda: self.other > self.set)
-            self.assertRaises(TypeError, lambda: self.other >= self.set)
+        self.assertRaises(TypeError, lambda: self.other >= self.set)
 
     def test_union_update_operator(self):
         try:
@@ -681,20 +679,20 @@ class TestCopying(unittest.TestCase):
 
     def test_copy(self):
         dup = self.set.copy()
-        dup_list = list(dup)
+        dup_list = list(dup); dup_list.sort()
-        set_list = list(self.set)
+        set_list = list(self.set); set_list.sort()
         self.assertEqual(len(dup_list), len(set_list))
-        for elt in dup_list:
+        for i in range(len(dup_list)):
-            self.assertTrue(elt in set_list)
+            self.assertTrue(dup_list[i] is set_list[i])
 
     def test_deep_copy(self):
         dup = copy.deepcopy(self.set)
         ##print type(dup), repr(dup)
-        dup_list = list(dup)
+        dup_list = list(dup); dup_list.sort()
-        set_list = list(self.set)
+        set_list = list(self.set); set_list.sort()
         self.assertEqual(len(dup_list), len(set_list))
-        for elt in dup_list:
+        for i in range(len(dup_list)):
-            self.assertTrue(elt in set_list)
+            self.assertEqual(dup_list[i], set_list[i])
 
 #------------------------------------------------------------------------------
 

Lib/test/test_shelve.py

@@ -4,8 +4,6 @@
 import glob
 from test import test_support
 
-test_support.import_module('anydbm', deprecated=True)
-
 class TestCase(unittest.TestCase):
 
     fn = "shelftemp" + os.extsep + "db"

Lib/test/test_site.py

@@ -258,7 +258,7 @@ def test_abs__file__(self):
         site.abs__file__()
         for module in (sys, os, __builtin__):
             try:
-                self.assertTrue(os.path.isabs(module.__file__), repr(module))
+                self.assertTrue(os.path.isabs(module.__file__), `module`)
             except AttributeError:
                 continue
         # We could try everything in sys.modules; however, when regrtest.py
@@ -310,7 +310,7 @@ def test_setdefaultencoding_removed(self):
 
     def test_sitecustomize_executed(self):
         # If sitecustomize is available, it should have been imported.
-        if "sitecustomize" not in sys.modules:
+        if not sys.modules.has_key("sitecustomize"):
             try:
                 import sitecustomize
             except ImportError:

Lib/test/test_slice.py

@@ -115,9 +115,7 @@ def __setslice__(self, i, j, k):
                 tmp.append((i, j, k))
 
         x = X()
-        # Silence Py3k warning
+        x[1:2] = 42
-        with test_support.check_warnings():
-            x[1:2] = 42
         self.assertEquals(tmp, [(1, 2, 42)])
 
     def test_pickle(self):

Lib/test/test_socket.py

@@ -123,7 +123,7 @@ def clientRun(self, test_func):
         self.server_ready.wait()
         self.client_ready.set()
         self.clientSetUp()
-        if not hasattr(test_func, '__call__'):
+        if not callable(test_func):
             raise TypeError, "test_func must be a callable function"
         try:
             test_func()
@@ -282,7 +282,7 @@ def testRefCountGetNameInfo(self):
                 orig = sys.getrefcount(__name__)
                 socket.getnameinfo(__name__,0)
             except TypeError:
-                if sys.getrefcount(__name__) != orig:
+                if sys.getrefcount(__name__) <> orig:
                     self.fail("socket.getnameinfo loses a reference")
 
     def testInterpreterCrash(self):
@@ -1234,9 +1234,7 @@ def testRecvInto(self):
         self.assertEqual(msg, MSG)
 
     def _testRecvInto(self):
-        # Silence Py3k warning
+        buf = buffer(MSG)
-        with test_support.check_warnings():
-            buf = buffer(MSG)
         self.serv_conn.send(buf)
 
     def testRecvFromInto(self):
@@ -1247,9 +1245,7 @@ def testRecvFromInto(self):
         self.assertEqual(msg, MSG)
 
     def _testRecvFromInto(self):
-        # Silence Py3k warning
+        buf = buffer(MSG)
-        with test_support.check_warnings():
-            buf = buffer(MSG)
         self.serv_conn.send(buf)
 
 

Lib/test/test_sort.py

@@ -2,7 +2,6 @@
 import random
 import sys
 import unittest
-import warnings
 
 verbose = test_support.verbose
 nerrors = 0
@@ -186,7 +185,7 @@ def test_baddecorator(self):
     def test_stability(self):
         data = [(random.randrange(100), i) for i in xrange(200)]
         copy = data[:]
-        data.sort(key=lambda x: x[0])   # sort on the random first field
+        data.sort(key=lambda (x,y): x)  # sort on the random first field
         copy.sort()                     # sort using both fields
         self.assertEqual(data, copy)    # should get the same result
 
@@ -208,7 +207,7 @@ def test_key_with_exception(self):
         # Verify that the wrapper has been removed
         data = range(-2,2)
         dup = data[:]
-        self.assertRaises(ZeroDivisionError, data.sort, None, lambda x: 1 // x)
+        self.assertRaises(ZeroDivisionError, data.sort, None, lambda x: 1/x)
         self.assertEqual(data, dup)
 
     def test_key_with_mutation(self):
@@ -275,21 +274,17 @@ def test_main(verbose=None):
         TestBugs,
     )
 
-    with warnings.catch_warnings():
+    test_support.run_unittest(*test_classes)
-        # Silence Py3k warning
-        warnings.filterwarnings("ignore", "the cmp argument is not supported",
-                                DeprecationWarning)
-        test_support.run_unittest(*test_classes)
 
-        # verify reference counting
+    # verify reference counting
-        if verbose and hasattr(sys, "gettotalrefcount"):
+    if verbose and hasattr(sys, "gettotalrefcount"):
-            import gc
+        import gc
-            counts = [None] * 5
+        counts = [None] * 5
-            for i in xrange(len(counts)):
+        for i in xrange(len(counts)):
-                test_support.run_unittest(*test_classes)
+            test_support.run_unittest(*test_classes)
-                gc.collect()
+            gc.collect()
-                counts[i] = sys.gettotalrefcount()
+            counts[i] = sys.gettotalrefcount()
-            print counts
+        print counts
 
 if __name__ == "__main__":
     test_main(verbose=True)

Lib/test/test_sqlite.py

@@ -4,21 +4,14 @@
 # Skip test if _sqlite3 module was not built.
 import_module('_sqlite3')
 
-import warnings
 from sqlite3.test import (dbapi, types, userfunctions, py25tests,
                                 factory, transactions, hooks, regression,
                                 dump)
 
 def test_main():
-    with warnings.catch_warnings():
+    run_unittest(dbapi.suite(), types.suite(), userfunctions.suite(),
-        # Silence Py3k warnings
+                 py25tests.suite(), factory.suite(), transactions.suite(),
-        warnings.filterwarnings("ignore", "buffer.. not supported",
+                 hooks.suite(), regression.suite(), dump.suite())
-                                DeprecationWarning)
-        warnings.filterwarnings("ignore", "classic int division",
-                                DeprecationWarning)
-        run_unittest(dbapi.suite(), types.suite(), userfunctions.suite(),
-                     py25tests.suite(), factory.suite(), transactions.suite(),
-                     hooks.suite(), regression.suite(), dump.suite())
 
 if __name__ == "__main__":
     test_main()

Lib/test/test_ssl.py

@@ -808,7 +808,7 @@ def testReadCert(self):
                     if test_support.verbose:
                         sys.stdout.write(pprint.pformat(cert) + '\n')
                         sys.stdout.write("Connection cipher is " + str(cipher) + '.\n')
-                    if 'subject' not in cert:
+                    if not cert.has_key('subject'):
                         raise test_support.TestFailed(
                             "No subject field in certificate: %s." %
                             pprint.pformat(cert))
@@ -970,9 +970,7 @@ def testSocketServer(self):
                 # now fetch the same data from the HTTPS server
                 url = 'https://127.0.0.1:%d/%s' % (
                     server.port, os.path.split(CERTFILE)[1])
-                # Silence Py3k warning
+                f = urllib.urlopen(url)
-                with test_support.check_warnings():
-                    f = urllib.urlopen(url)
                 dlen = f.info().getheader("content-length")
                 if dlen and (int(dlen) > 0):
                     d2 = f.read(int(dlen))

Lib/test/test_struct.py

@@ -471,7 +471,7 @@ def test_unpack_with_buffer(self):
     def test_bool(self):
         for prefix in tuple("<>!=")+('',):
             false = (), [], [], '', 0
-            true = [1], 'test', 5, -1, 0xffffffffL+1, 0xffffffff//2
+            true = [1], 'test', 5, -1, 0xffffffffL+1, 0xffffffff/2
 
             falseFormat = prefix + '?' * len(false)
             packedFalse = struct.pack(falseFormat, *false)
@@ -507,11 +507,7 @@ def test_crasher(self):
 
 
 def test_main():
-    with warnings.catch_warnings():
+    run_unittest(StructTest)
-        # Silence Py3k warnings
-        warnings.filterwarnings("ignore", "buffer.. not supported",
-                                DeprecationWarning)
-        run_unittest(StructTest)
 
 if __name__ == '__main__':
     test_main()

Lib/test/test_syntax.py

@@ -552,11 +552,7 @@ def test_kwargs_last(self):
 def test_main():
     test_support.run_unittest(SyntaxTestCase)
     from test import test_syntax
-    with warnings.catch_warnings():
+    test_support.run_doctest(test_syntax, verbosity=True)
-        # Silence Py3k warning
-        warnings.filterwarnings("ignore", "backquote not supported",
-                                SyntaxWarning)
-        test_support.run_doctest(test_syntax, verbosity=True)
 
 if __name__ == "__main__":
     test_main()

Lib/test/test_sys.py

@@ -68,9 +68,7 @@ def test_original_excepthook(self):
     # Python/pythonrun.c::PyErr_PrintEx() is tricky.
 
     def test_exc_clear(self):
-        # Silence Py3k warning
+        self.assertRaises(TypeError, sys.exc_clear, 42)
-        with test.test_support.check_warnings():
-            self.assertRaises(TypeError, sys.exc_clear, 42)
 
         # Verify that exc_info is present and matches exc, then clear it, and
         # check that it worked.
@@ -80,9 +78,7 @@ def clear_check(exc):
             self.assertTrue(value is exc)
             self.assertTrue(traceback is not None)
 
-            # Silence Py3k warning
+            sys.exc_clear()
-            with test.test_support.check_warnings():
-                sys.exc_clear()
 
             typ, value, traceback = sys.exc_info()
             self.assertTrue(typ is None)
@@ -488,9 +484,7 @@ def test_objecttypes(self):
         # bool
         check(True, size(h + 'l'))
         # buffer
-        # Silence Py3k warning
+        check(buffer(''), size(h + '2P2Pil'))
-        with test.test_support.check_warnings():
-            check(buffer(''), size(h + '2P2Pil'))
         # builtin_function_or_method
         check(len, size(h + '3P'))
         # bytearray

Lib/test/test_tarfile.py

@@ -712,9 +712,7 @@ def exclude(name):
                 return os.path.isfile(name)
 
             tar = tarfile.open(tmpname, self.mode, encoding="iso8859-1")
-            # Silence Py3k warning
+            tar.add(tempdir, arcname="empty_dir", exclude=exclude)
-            with test_support.check_warnings():
-                tar.add(tempdir, arcname="empty_dir", exclude=exclude)
             tar.close()
 
             tar = tarfile.open(tmpname, "r")

Lib/test/test_threadsignals.py

@@ -14,7 +14,7 @@
 signalled_all=thread.allocate_lock()
 
 
-def registerSignals(for_usr1, for_usr2, for_alrm):
+def registerSignals((for_usr1, for_usr2, for_alrm)):
     usr1 = signal.signal(signal.SIGUSR1, for_usr1)
     usr2 = signal.signal(signal.SIGUSR2, for_usr2)
     alrm = signal.signal(signal.SIGALRM, for_alrm)
@@ -74,11 +74,11 @@ def test_main():
                           signal.SIGUSR2 : {'tripped': 0, 'tripped_by': 0 },
                           signal.SIGALRM : {'tripped': 0, 'tripped_by': 0 } }
 
-    oldsigs = registerSignals(handle_signals, handle_signals, handle_signals)
+    oldsigs = registerSignals((handle_signals, handle_signals, handle_signals))
     try:
         run_unittest(ThreadSignals)
     finally:
-        registerSignals(*oldsigs)
+        registerSignals(oldsigs)
 
 if __name__ == '__main__':
     test_main()

Lib/test/test_trace.py

@@ -401,7 +401,7 @@ def f(self):
         we're testing, so that the 'exception' trace event fires."""
         if self.raiseOnEvent == 'exception':
             x = 0
-            y = 1 // x
+            y = 1/x
         else:
             return 1
 

Lib/test/test_traceback.py

@@ -4,7 +4,6 @@
 from StringIO import StringIO
 import sys
 import unittest
-from imp import reload
 from test.test_support import run_unittest, is_jython, Error
 
 import traceback
@@ -149,7 +148,7 @@ def test_string_exception2(self):
     def test_format_exception_only_bad__str__(self):
         class X(Exception):
             def __str__(self):
-                1 // 0
+                1/0
         err = traceback.format_exception_only(X, X())
         self.assertEqual(len(err), 1)
         str_value = '<unprintable %s object>' % X.__name__

Lib/test/test_transformer.py

@@ -1,8 +1,5 @@
 import unittest
 from test import test_support
-
-# Silence Py3k warning
-test_support.import_module('compiler', deprecated=True)
 from compiler import transformer, ast
 from compiler import compile
 

Lib/test/test_types.py

@@ -4,7 +4,6 @@
 import unittest
 import sys
 import locale
-import warnings
 
 class TypesTests(unittest.TestCase):
 
@@ -711,13 +710,7 @@ def test_format_spec_errors(self):
             self.assertRaises(ValueError, format, 0, ',' + code)
 
 def test_main():
-    with warnings.catch_warnings():
+    run_unittest(TypesTests)
-        # Silence Py3k warnings
-        warnings.filterwarnings("ignore", "buffer.. not supported",
-                                DeprecationWarning)
-        warnings.filterwarnings("ignore", "classic long division",
-                                DeprecationWarning)
-        run_unittest(TypesTests)
 
 if __name__ == '__main__':
     test_main()

Lib/test/test_undocumented_details.py

@@ -1,4 +1,4 @@
-from test.test_support import run_unittest, check_warnings
+from test.test_support import run_unittest, have_unicode
 import unittest
 import sys
 
@@ -33,9 +33,7 @@ def h():
         self.assertTrue(g_cell != h_cell)
 
 def test_main():
-    # Silence Py3k warnings
+    run_unittest(TestImplementationComparisons)
-    with check_warnings():
-        run_unittest(TestImplementationComparisons)
 
 if __name__ == '__main__':
     test_main()

Lib/test/test_unittest.py

@@ -3056,7 +3056,7 @@ def _raise(e):
         try:
             self.assertRaises(KeyError, lambda: None)
         except self.failureException as e:
-            self.assert_("KeyError not raised" in e.args, str(e))
+            self.assert_("KeyError not raised" in e, str(e))
         else:
             self.fail("assertRaises() didn't fail")
         try:
@@ -3073,7 +3073,7 @@ def _raise(e):
             with self.assertRaises(KeyError):
                 pass
         except self.failureException as e:
-            self.assert_("KeyError not raised" in e.args, str(e))
+            self.assert_("KeyError not raised" in e, str(e))
         else:
             self.fail("assertRaises() didn't fail")
         try:
@@ -3591,9 +3591,6 @@ def load_tests(loader, tests, pattern):
             def __eq__(self, other):
                 return self.path == other.path
 
-            # Silence Py3k warning
-            __hash__ = None
-
         loader._get_module_from_name = lambda name: Module(name)
         def loadTestsFromModule(module, use_load_tests):
             if use_load_tests:

Lib/test/test_univnewlines2k.py

@@ -80,9 +80,7 @@ def test_seek(self):
 
     def test_execfile(self):
         namespace = {}
-        # Silence Py3k warning
+        execfile(test_support.TESTFN, namespace)
-        with test_support.check_warnings():
-            execfile(test_support.TESTFN, namespace)
         func = namespace['line3']
         self.assertEqual(func.func_code.co_firstlineno, 3)
         self.assertEqual(namespace['line4'], FATX)

Lib/test/test_urllib.py

@@ -6,7 +6,6 @@
 from test import test_support
 import os
 import mimetools
-import random
 import tempfile
 import StringIO
 
@@ -102,7 +101,7 @@ def setUp(self):
         # Records changes to env vars
         self.env = test_support.EnvironmentVarGuard()
         # Delete all proxy related env vars
-        for k in os.environ.keys():
+        for k, v in os.environ.iteritems():
             if 'proxy' in k.lower():
                 self.env.unset(k)
 
@@ -410,13 +409,6 @@ def test_quoting_plus(self):
         self.assertEqual(urllib.quote_plus('alpha+beta gamma', '+'),
                          'alpha+beta+gamma')
 
-    def test_quote_leak(self):
-        # bug 5596 - highlight the refleak in the internal _safemaps cache
-        safe = ''.join(chr(random.randrange(128)) for i in '123456')
-        text = 'abcdefghijklmnopqrstuvwxyz'
-        result = urllib.quote(text, safe=safe)
-        self.assertEqual(result, text)
-
 class UnquotingTests(unittest.TestCase):
     """Tests for unquote() and unquote_plus()
 

Lib/test/test_urllib2_localnet.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import mimetools
 import threading
 import urlparse
 import urllib2
@@ -7,7 +8,6 @@
 import unittest
 import hashlib
 from test import test_support
-mimetools = test_support.import_module('mimetools', deprecated=True)
 
 # Loopback http server infrastructure
 
@@ -154,13 +154,13 @@ def handle_request(self, request_handler):
         if len(self._users) == 0:
             return True
 
-        if 'Proxy-Authorization' not in request_handler.headers:
+        if not request_handler.headers.has_key('Proxy-Authorization'):
             return self._return_auth_challenge(request_handler)
         else:
             auth_dict = self._create_auth_dict(
                 request_handler.headers['Proxy-Authorization']
                 )
-            if auth_dict["username"] in self._users:
+            if self._users.has_key(auth_dict["username"]):
                 password = self._users[ auth_dict["username"] ]
             else:
                 return self._return_auth_challenge(request_handler)

Lib/test/test_urllibnet.py

@@ -7,7 +7,7 @@
 import urllib
 import sys
 import os
-mimetools = test_support.import_module("mimetools", deprecated=True)
+import mimetools
 
 
 def _open_with_retry(func, host, *args, **kwargs):

Lib/test/test_userdict.py

@@ -45,9 +45,7 @@ def test_all(self):
         # Test __repr__
         self.assertEqual(str(u0), str(d0))
         self.assertEqual(repr(u1), repr(d1))
-        # Silence Py3k warning
+        self.assertEqual(`u2`, `d2`)
-        with test_support.check_warnings():
-            self.assertEqual(eval('`u2`'), eval('`d2`'))
 
         # Test __cmp__ and __len__
         all = [d0, d1, d2, u, u0, u1, u2, uu, uu0, uu1, uu2]
@@ -97,14 +95,12 @@ def display(self): print self
 
         # Test has_key and "in".
         for i in u2.keys():
+            self.assertTrue(u2.has_key(i))
             self.assertTrue(i in u2)
+            self.assertEqual(u1.has_key(i), d1.has_key(i))
             self.assertEqual(i in u1, i in d1)
+            self.assertEqual(u0.has_key(i), d0.has_key(i))
             self.assertEqual(i in u0, i in d0)
-            # Silence Py3k warning
-            with test_support.check_warnings():
-                self.assertTrue(u2.has_key(i))
-                self.assertEqual(u1.has_key(i), d1.has_key(i))
-                self.assertEqual(u0.has_key(i), d0.has_key(i))
 
         # Test update
         t = UserDict.UserDict()

Lib/test/test_userlist.py

@@ -2,7 +2,6 @@
 
 from UserList import UserList
 from test import test_support, list_tests
-import warnings
 
 class UserListTest(list_tests.CommonTest):
     type2test = UserList
@@ -54,11 +53,7 @@ def __getitem__(self, key):
         self.assertEqual(iter(T((1,2))).next(), "0!!!")
 
 def test_main():
-    with warnings.catch_warnings():
+    test_support.run_unittest(UserListTest)
-        # Silence Py3k warnings
-        warnings.filterwarnings("ignore", ".+slice__ has been removed",
-                                DeprecationWarning)
-        test_support.run_unittest(UserListTest)
 
 if __name__ == "__main__":
     test_main()

Lib/test/test_userstring.py

@@ -136,11 +136,8 @@ def test_imul(self):
 
 def test_main():
     with warnings.catch_warnings():
-        # Silence Py3k warnings
         warnings.filterwarnings("ignore", ".*MutableString",
                                 DeprecationWarning)
-        warnings.filterwarnings("ignore", ".+slice__ has been removed",
-                                DeprecationWarning)
         test_support.run_unittest(UserStringTest, MutableStringTest)
 
 if __name__ == "__main__":