From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 3 Aug 2010 05:17:27 +0000 (+0000)
Subject: Fix more warnings in test_builtin.
X-Git-Tag: v2.6.6rc1~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c00b88cedb996008ae53ef9e6e36f7dac82eb693;p=thirdparty%2FPython%2Fcpython.git

Fix more warnings in test_builtin.
---

diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index 1688f50c343a..9401f6501faa 100644
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -1577,17 +1577,25 @@ class TestSorted(unittest.TestCase):
         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 _check_py3k_warnings(
+            (".+ not supported in 3.x", DeprecationWarning),
+            (".+ is renamed to imp.reload", DeprecationWarning),
+            ("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