diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-22 12:56:39 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-22 12:56:39 (GMT) |
| commit | 4fd2ff90a4d45b042549ff5919b41ffce3c245e8 (patch) | |
| tree | fd7d6ef0a711c2eae90df3871c8f50d7526be5b8 /Objects/unicodeobject.c | |
| parent | 974dd583720cee19f3f722002720a0f2cd704577 (diff) | |
| download | cpython-4fd2ff90a4d45b042549ff5919b41ffce3c245e8.zip cpython-4fd2ff90a4d45b042549ff5919b41ffce3c245e8.tar.gz cpython-4fd2ff90a4d45b042549ff5919b41ffce3c245e8.tar.bz2 | |
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.
........
Diffstat (limited to 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 133cae5..111f9bb 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); } |