From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 22 Mar 2010 12:56:39 +0000 (+0000)
Subject: Merged revisions 79278,79280 via svnmerge from
X-Git-Tag: v2.6.6rc1~557
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4fd2ff90a4d45b042549ff5919b41ffce3c245e8;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 4b2d0554d4..6f6e96fba0 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1142,6 +1142,15 @@ class UnicodeTest(
         self.assertRaises(MemoryError, alloc)
         self.assertRaises(MemoryError, alloc)
 
+    def test_format_subclass(self):
+        class U(unicode):
+            def __unicode__(self):
+                return u'__unicode__ overridden'
+        u = U(u'xxx')
+        self.assertEquals("%s" % u, u'__unicode__ overridden')
+        self.assertEquals("{0}".format(u), u'__unicode__ overridden')
+
+
 def test_main():
     test_support.run_unittest(__name__)
 
diff --git a/Misc/NEWS b/Misc/NEWS
index e4500a8979..d4a11dc734 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 2.6.6 alpha 1?
 Core and Builtins
 -----------------
 
+- Issue #1583863: An unicode subclass can now override the __unicode__ method
+
 - Issue #7544: Preallocate thread memory before creating the thread to avoid
   a fatal error in low memory condition.
 
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 133cae5d5f..111f9bb096 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -8653,7 +8653,7 @@ PyObject *PyUnicode_Format(PyObject *format,
 
             case 's':
             case 'r':
-                if (PyUnicode_Check(v) && c == 's') {
+                if (PyUnicode_CheckExact(v) && c == 's') {
                     temp = v;
                     Py_INCREF(temp);
                 }