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.
........
This commit is contained in:
Victor Stinner 2010-03-22 12:56:39 +00:00
parent 974dd58372
commit 4fd2ff90a4
3 changed files with 12 additions and 1 deletions

View file

@ -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);
}