Issue19995: fixed typo; switched from test.support.check_warnings to assertWarns

diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index d31838c6c4a83d39ddfc43d5a39ce47412dddd9e..8175fee65f3ad387e40d3ea44619c7d89c2d9434 100644 (file)
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1139,13 +1139,6 @@ class UnicodeTest(string_tests.CommonTest,
                 self.value = float(value)
             def __int__(self):
                 return int(self.value)
-        def check_depr(modifier, value):
-            with support.check_warnings(
-                    ("", DeprecationWarning),
-                    quiet=False,
-                    ):
-                warnings.simplefilter('always')
-                modifier % value
         pi = PsuedoFloat(3.1415)
         letter_m = PsuedoInt(109)
         self.assertEqual('%x' % 42, '2a')
@@ -1156,14 +1149,11 @@ class UnicodeTest(string_tests.CommonTest,
         self.assertEqual('%X' % letter_m, '6D')
         self.assertEqual('%o' % letter_m, '155')
         self.assertEqual('%c' % letter_m, 'm')
-        for mod, value in (
-                ('%x', pi),
-                ('%x', 3.14),
-                ('%X', 2.11),
-                ('%o', 1.79),
-                ('%c', pi),
-                ):
-            check_depr(mod, value)
+        self.assertWarns(DeprecationWarning, '%x'.__mod__, pi),
+        self.assertWarns(DeprecationWarning, '%x'.__mod__, 3.14),
+        self.assertWarns(DeprecationWarning, '%X'.__mod__, 2.11),
+        self.assertWarns(DeprecationWarning, '%o'.__mod__, 1.79),
+        self.assertWarns(DeprecationWarning, '%c'.__mod__, pi),
 
     def test_formatting_with_enum(self):
         # issue18780

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index c8370bd8ac31ba2fe71d115844202b05863dde82..1ce10cfd903ab2d282d2ba1b74ada29973bb8172 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -14005,7 +14005,7 @@ mainformatlong(PyObject *v,
         goto wrongtype;
 
     /* make sure number is a type of integer */
-    /* if not, issue depracation warning for now */
+    /* if not, issue deprecation warning for now */
     if (!PyLong_Check(v)) {
         if (type == 'o' || type == 'x' || type == 'X') {
             iobj = PyNumber_Index(v);
@@ -14103,7 +14103,7 @@ formatchar(PyObject *v)
         PyObject *iobj;
         long x;
         /* make sure number is a type of integer */
-        /* if not, issue depracation warning for now */
+        /* if not, issue deprecation warning for now */
         if (!PyLong_Check(v)) {
             iobj = PyNumber_Index(v);
             if (iobj == NULL) {