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/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 5fd2372..2ccec90 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9308,7 +9308,7 @@
case 's':
case 'r':
case 'a':
- if (PyUnicode_Check(v) && c == 's') {
+ if (PyUnicode_CheckExact(v) && c == 's') {
temp = v;
Py_INCREF(temp);
}