From: Steven Bethard <steven.bethard@gmail.com>
Date: Fri, 21 Mar 2008 21:01:18 +0000 (+0000)
Subject: Replace hack in regrtest.py with use of sys.py3kwarning.
X-Git-Tag: v2.6a2~180
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d290b04ee3645f8dd2e30c329c5ead2db16ece62;p=thirdparty%2FPython%2Fcpython.git

Replace hack in regrtest.py with use of sys.py3kwarning.
---

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index f8eac8c9b7de..5706813ca40d 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -1164,13 +1164,8 @@ class _ExpectedSkips:
                 self.expected.add('test_sunaudiodev')
                 self.expected.add('test_nis')
 
-            # TODO: This is a hack to raise TestSkipped if -3 is not enabled.
-            # Instead of relying on callable to have a warning, we should expose
-            # the -3 flag to Python code somehow
-            with test_support.catch_warning() as w:
-                callable(int)
-                if w.message is None:
-                    self.expected.add('test_py3kwarn')
+            if not sys.py3kwarning:
+                self.expected.add('test_py3kwarn')
 
             self.valid = True