Use sys.py3kwarning instead of trying to trigger a Py3k-related warning.

diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index cc1e9f4d50916165c34911f2dc24b8c49cc387e0..cb450ff14be7e3a20950900e09ac8d4a88d04817 100644 (file)
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -1,14 +1,12 @@
 import unittest
-from test.test_support import catch_warning, TestSkipped, run_unittest
+import sys
+from test.test_support import (catch_warning, TestSkipped, run_unittest,
+                                TestSkipped)
 import warnings
 
-# 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 catch_warning() as w:
-    callable(int)
-    if w.message is None:
-        raise TestSkipped('%s must be run with the -3 flag' % __name__)
+if not sys.py3kwarning:
+    raise TestSkipped('%s must be run with the -3 flag' % __name__)
+
 
 class TestPy3KWarnings(unittest.TestCase):