From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 22 Mar 2010 12:53:14 +0000 (+0000)
Subject: Merged revisions 79281 via svnmerge from
X-Git-Tag: v3.1.3rc1~1040
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abdb21a3a89e0fed89e361d86990c90a998ac9ec;p=python

Merged revisions 79281 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79281 | victor.stinner | 2010-03-22 13:50:40 +0100 (lun., 22 mars 2010) | 16 lines

  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 7f87b438ea..6e4f0484a4 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1223,6 +1223,14 @@ class UnicodeTest(
         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 b8959df4e9..3a9a64186a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,11 @@ What's New in Python 3.1.3?
 
 *Release date: 20XX-XX-XX*
 
+Core and Builtins
+-----------------
+
+- Issue #1583863: An str subclass can now override the __str__ method
+
 Library
 -------
 
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 5fd23729b6..2ccec90c08 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9308,7 +9308,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);
                 }