commit 808fc0a0eea56dd4ef2fa9f9dee00ef0c20760f2
author Victor Stinner <victor.stinner@haypocalc.com> Mon Mar 22 12:50:40 2010 +0000
committer Victor Stinner <victor.stinner@haypocalc.com> Mon Mar 22 12:50:40 2010 +0000
tree 9a5ed66ce46fb860e57a4bbacdc8ac66357bd478
parent 0477bf3a934b9e959ce4a64f25ce24310797d50e

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.
........

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 3ee90b5..28b8c66 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9124,7 +9124,7 @@
             case 's':
             case 'r':
             case 'a':
-                if (PyUnicode_Check(v) && c == 's') {
+                if (PyUnicode_CheckExact(v) && c == 's') {
                     temp = v;
                     Py_INCREF(temp);
                 }