changeset: 68399:ee259a4f3eee user: Eric V. Smith date: Sat Mar 12 10:08:48 2011 -0500 files: Lib/test/test_builtin.py Lib/test/test_unicode.py Misc/NEWS Objects/typeobject.c description: Issue 9856: Change object.__format__ with a non-empty format string from a PendingDeprecationWarning to a DeprecationWarning. diff -r cebaf1bdaf78 -r ee259a4f3eee Lib/test/test_builtin.py --- a/Lib/test/test_builtin.py Sat Mar 12 15:56:09 2011 +0100 +++ b/Lib/test/test_builtin.py Sat Mar 12 10:08:48 2011 -0500 @@ -1279,14 +1279,14 @@ # -------------------------------------------------------------------- # Issue #7994: object.__format__ with a non-empty format string is - # pending deprecated + # deprecated def test_deprecated_format_string(obj, fmt_str, should_raise_warning): with warnings.catch_warnings(record=True) as w: - warnings.simplefilter("always", PendingDeprecationWarning) + warnings.simplefilter("always", DeprecationWarning) format(obj, fmt_str) if should_raise_warning: self.assertEqual(len(w), 1) - self.assertIsInstance(w[0].message, PendingDeprecationWarning) + self.assertIsInstance(w[0].message, DeprecationWarning) self.assertIn('object.__format__ with a non-empty format ' 'string', str(w[0].message)) else: diff -r cebaf1bdaf78 -r ee259a4f3eee Lib/test/test_unicode.py --- a/Lib/test/test_unicode.py Sat Mar 12 15:56:09 2011 +0100 +++ b/Lib/test/test_unicode.py Sat Mar 12 10:08:48 2011 -0500 @@ -614,7 +614,7 @@ self.assertEqual('{0!s}'.format(G('data')), 'string is data') msg = 'object.__format__ with a non-empty format string is deprecated' - with support.check_warnings((msg, PendingDeprecationWarning)): + with support.check_warnings((msg, DeprecationWarning)): self.assertEqual('{0:^10}'.format(E('data')), ' E(data) ') self.assertEqual('{0:^10s}'.format(E('data')), ' E(data) ') self.assertEqual('{0:>15s}'.format(G('data')), ' string is data') diff -r cebaf1bdaf78 -r ee259a4f3eee Misc/NEWS --- a/Misc/NEWS Sat Mar 12 15:56:09 2011 +0100 +++ b/Misc/NEWS Sat Mar 12 10:08:48 2011 -0500 @@ -10,6 +10,10 @@ Core and Builtins ----------------- +- Issue #9856: Change object.__format__ with a non-empty format string + to be a DeprecationWarning. In 3.2 it was a PendingDeprecationWarning. + In 3.4 it will be a TypeError. + - Issue #11244: The peephole optimizer is now able to constant-fold arbitrarily complex expressions. This also fixes a 3.2 regression where operations involving negative numbers were not constant-folded. diff -r cebaf1bdaf78 -r ee259a4f3eee Objects/typeobject.c --- a/Objects/typeobject.c Sat Mar 12 15:56:09 2011 +0100 +++ b/Objects/typeobject.c Sat Mar 12 10:08:48 2011 -0500 @@ -3401,21 +3401,21 @@ self_as_str = PyObject_Str(self); if (self_as_str != NULL) { /* Issue 7994: If we're converting to a string, we - should reject format specifications */ + should reject format specifications */ if (PyUnicode_GET_SIZE(format_spec)> 0) { - if (PyErr_WarnEx(PyExc_PendingDeprecationWarning, - "object.__format__ with a non-empty format " - "string is deprecated", 1) < 0) { - goto done; - } - /* Eventually this will become an error: - PyErr_Format(PyExc_TypeError, - "non-empty format string passed to object.__format__"); - goto done; - */ - } - - result = PyObject_Format(self_as_str, format_spec); + if (PyErr_WarnEx(PyExc_DeprecationWarning, + "object.__format__ with a non-empty format " + "string is deprecated", 1) < 0) { + goto done; + } + /* Eventually this will become an error: + PyErr_Format(PyExc_TypeError, + "non-empty format string passed to object.__format__"); + goto done; + */ + } + + result = PyObject_Format(self_as_str, format_spec); } done: