diff options
| author | Guido van Rossum <guido@python.org> | 2007-07-11 09:28:11 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-07-11 09:28:11 (GMT) |
| commit | 55b4a7b6dc58a49a60f93fa198a6cca1ac28a31a (patch) | |
| tree | 4a28563e0193c18352f4dd35dca1c2117589849f /Objects/object.c | |
| parent | f074b640f913dcf90756676409fc0df841960fb0 (diff) | |
| download | cpython-55b4a7b6dc58a49a60f93fa198a6cca1ac28a31a.zip cpython-55b4a7b6dc58a49a60f93fa198a6cca1ac28a31a.tar.gz cpython-55b4a7b6dc58a49a60f93fa198a6cca1ac28a31a.tar.bz2 | |
Make test_descr.py pass. Had to disable a few tests, remove references
to 'file', and fix a bunch of subtleties in the behavior of objects
related to overriding __str__. Also disabled a few tests that I couldn't
see how to fix but that seemed to be checking silly stuff only.
Diffstat (limited to 'Objects/object.c')
| -rw-r--r-- | Objects/object.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Objects/object.c b/Objects/object.c index c087b71..ee4f582 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -415,9 +415,7 @@ _PyObject_Str(PyObject *v) res = (*v->ob_type->tp_str)(v); if (res == NULL) return NULL; - type_ok = PyString_Check(res); - type_ok = type_ok || PyUnicode_Check(res); - if (!type_ok) { + if (!(PyString_Check(res) || PyUnicode_Check(res))) { PyErr_Format(PyExc_TypeError, "__str__ returned non-string (type %.200s)", res->ob_type->tp_name); @@ -476,8 +474,10 @@ PyObject_Unicode(PyObject *v) } else { PyErr_Clear(); - if (PyUnicode_Check(v)) { - /* For a Unicode subtype that's didn't overwrite __unicode__, + if (PyUnicode_Check(v) && + v->ob_type->tp_str == PyUnicode_Type.tp_str) { + /* For a Unicode subtype that's didn't overwrite + __unicode__ or __str__, return a true Unicode object with the same data. */ return PyUnicode_FromUnicode(PyUnicode_AS_UNICODE(v), PyUnicode_GET_SIZE(v)); |