#7092: Silence py3k warnings in test_exceptions and test_pep352. Patch by Florent Xicluna.
diff --git a/Lib/test/test_pep352.py b/Lib/test/test_pep352.py
index 7438d59..4654e26 100644
--- a/Lib/test/test_pep352.py
+++ b/Lib/test/test_pep352.py
@@ -4,14 +4,27 @@
import warnings
from test.test_support import run_unittest
import os
+import sys
from platform import system as platform_system
-def ignore_message_warning():
- """Ignore the DeprecationWarning for BaseException.message."""
- warnings.resetwarnings()
- warnings.filterwarnings("ignore", "BaseException.message",
- DeprecationWarning)
+DEPRECATION_WARNINGS = ["BaseException.message has been deprecated"]
+if sys.py3kwarning:
+ DEPRECATION_WARNINGS.extend(
+ ["exceptions must derive from BaseException",
+ "catching classes that don't inherit from BaseException is not allowed",
+ "__get(item|slice)__ not supported for exception classes"])
+
+# 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):
@@ -21,13 +34,11 @@
def test_builtins_new_style(self):
self.assertTrue(issubclass(Exception, object))
+ @ignore_deprecation_warnings
def verify_instance_interface(self, ins):
- with warnings.catch_warnings():
- ignore_message_warning()
- for attr in ("args", "message", "__str__", "__repr__",
- "__getitem__"):
- self.assertTrue(hasattr(ins, attr),
- "%s missing %s attribute" %
+ for attr in ("args", "message", "__str__", "__repr__", "__getitem__"):
+ self.assertTrue(hasattr(ins, attr),
+ "%s missing %s attribute" %
(ins.__class__.__name__, attr))
def test_inheritance(self):
@@ -91,43 +102,39 @@
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)
- with warnings.catch_warnings():
- ignore_message_warning()
- results = ([len(exc.args), 1], [exc.args[0], arg],
- [exc.message, arg],
- [str(exc), str(arg)], [unicode(exc), unicode(arg)],
- [repr(exc), exc.__class__.__name__ + repr(exc.args)], [exc[0],
- arg])
- self.interface_test_driver(results)
+ results = ([len(exc.args), 1], [exc.args[0], arg], [exc.message, arg],
+ [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)
- with warnings.catch_warnings():
- ignore_message_warning()
- results = ([len(exc.args), arg_count], [exc.args, args],
- [exc.message, ''], [str(exc), str(args)],
- [unicode(exc), unicode(args)],
- [repr(exc), exc.__class__.__name__ + repr(exc.args)],
- [exc[-1], args[-1]])
- self.interface_test_driver(results)
+ results = ([len(exc.args), arg_count], [exc.args, args],
+ [exc.message, ''], [str(exc), str(args)],
+ [unicode(exc), unicode(args)],
+ [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()
- with warnings.catch_warnings():
- ignore_message_warning()
- results = ([len(exc.args), 0], [exc.args, tuple()],
- [exc.message, ''],
- [str(exc), ''], [unicode(exc), u''],
- [repr(exc), exc.__class__.__name__ + '()'], [True, True])
- self.interface_test_driver(results)
+ results = ([len(exc.args), 0], [exc.args, tuple()],
+ [exc.message, ''],
+ [str(exc), ''], [unicode(exc), u''],
+ [repr(exc), exc.__class__.__name__ + '()'], [True, True])
+ self.interface_test_driver(results)
def test_message_deprecation(self):
@@ -179,6 +186,7 @@
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:
@@ -194,7 +202,7 @@
except ClassicClass:
pass
except:
- self.fail("unable to raise class class instance")
+ self.fail("unable to raise classic class instance")
def test_raise_new_style_non_exception(self):
# You cannot raise a new-style class that does not inherit from