(original) (raw)

changeset: 88426:cc8b21988efb parent: 88424:73781fe1daa2 user: Ethan Furman ethan@stoneleaf.us date: Sun Jan 12 08:42:35 2014 -0800 files: Lib/test/test_unicode.py Objects/unicodeobject.c description: Issue19995: fixed typo; switched from test.support.check_warnings to assertWarns diff -r 73781fe1daa2 -r cc8b21988efb Lib/test/test_unicode.py --- a/Lib/test/test_unicode.py Sun Jan 12 12:09:38 2014 +0200 +++ b/Lib/test/test_unicode.py Sun Jan 12 08:42:35 2014 -0800 @@ -1139,13 +1139,6 @@ 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 @@ 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 -r 73781fe1daa2 -r cc8b21988efb Objects/unicodeobject.c --- a/Objects/unicodeobject.c Sun Jan 12 12:09:38 2014 +0200 +++ b/Objects/unicodeobject.c Sun Jan 12 08:42:35 2014 -0800 @@ -14005,7 +14005,7 @@ 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 @@ 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) { /ethan@stoneleaf.us