From: Victor Stinner Date: Mon, 22 Mar 2010 12:50:40 +0000 (+0000) Subject: Merged revisions 79278,79280 via svnmerge from X-Git-Tag: v3.2a1~1345 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=808fc0a0eea56dd4ef2fa9f9dee00ef0c20760f2;p=python Merged revisions 79278,79280 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79278 | victor.stinner | 2010-03-22 13:24:37 +0100 (lun., 22 mars 2010) | 2 lines Issue #1583863: An unicode subclass can now override the __str__ method ........ r79280 | victor.stinner | 2010-03-22 13:36:28 +0100 (lun., 22 mars 2010) | 5 lines Fix the NEWS about my last commit: an unicode subclass can now override the __unicode__ method (and not the __str__ method). Simplify also the testcase. ........ --- diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index 1da2d1491c..4ac07123b8 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -1221,6 +1221,14 @@ class UnicodeTest(string_tests.CommonTest, self.assertRaises(MemoryError, alloc) self.assertRaises(MemoryError, alloc) + def test_format_subclass(self): + class S(str): + def __str__(self): + return '__str__ overridden' + s = S('xxx') + self.assertEquals("%s" % s, '__str__ overridden') + self.assertEquals("{}".format(s), '__str__ overridden') + def test_main(): support.run_unittest(__name__) diff --git a/Misc/NEWS b/Misc/NEWS index cfe45fb666..8a62cbf4a2 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,8 @@ What's New in Python 3.2 Alpha 1? Core and Builtins ----------------- +- Issue #1583863: An str subclass can now override the __str__ method + - Issue #8014: Setting a T_UINT or T_PYSSIZET attribute of an object with PyMemberDefs could produce an internal error; raise TypeError instead. diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 3ee90b58dd..28b8c66295 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -9124,7 +9124,7 @@ PyObject *PyUnicode_Format(PyObject *format, case 's': case 'r': case 'a': - if (PyUnicode_Check(v) && c == 's') { + if (PyUnicode_CheckExact(v) && c == 's') { temp = v; Py_INCREF(temp); }