[Python-checkins] r79278 - in python/trunk: Lib/test/test_unicode.py Misc/NEWS Objects/unicodeobject.c

[victor.stinner]

Author: victor.stinner
Date: Mon Mar 22 13:24:37 2010
New Revision: 79278

Log:
Issue #1583863: An unicode subclass can now override the __str__ method


Modified:
   python/trunk/Lib/test/test_unicode.py
   python/trunk/Misc/NEWS
   python/trunk/Objects/unicodeobject.c

Modified: python/trunk/Lib/test/test_unicode.py
==============================================================================
--- python/trunk/Lib/test/test_unicode.py	(original)
+++ python/trunk/Lib/test/test_unicode.py	Mon Mar 22 13:24:37 2010
@@ -1193,6 +1193,17 @@
         self.assertRaises(MemoryError, alloc)
         self.assertRaises(MemoryError, alloc)
 
+    def test_format_subclass(self):
+        class U(unicode):
+            def __str__(self):
+                return '__str__ overridden'
+            def __unicode__(self):
+                return u'__unicode__ overridden'
+        u = U(u'xxx')
+        self.assertEquals("%s" % u, u'__unicode__ overridden')
+        self.assertEquals("{}".format(u), u'__unicode__ overridden')
+
+
 def test_main():
     test_support.run_unittest(__name__)
 

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Mon Mar 22 13:24:37 2010
@@ -12,6 +12,8 @@
 Core and Builtins
 -----------------
 
+- Issue #1583863: An unicode subclass can now override the __str__ method
+
 - Issue #6474: Make error message from passing an inadequate number of keyword
   arguments to a function correct.
 

Modified: python/trunk/Objects/unicodeobject.c
==============================================================================
--- python/trunk/Objects/unicodeobject.c	(original)
+++ python/trunk/Objects/unicodeobject.c	Mon Mar 22 13:24:37 2010
@@ -8466,7 +8466,7 @@
 
             case 's':
             case 'r':
-                if (PyUnicode_Check(v) && c == 's') {
+                if (PyUnicode_CheckExact(v) && c == 's') {
                     temp = v;
                     Py_INCREF(temp);
                 }