mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 02:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Make test_descr.py pass. Had to disable a few tests, remove references

Browse source 
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.
This commit is contained in:
Guido van Rossum 2007-07-11 09:28:11 +00:00
parent f074b640f9
commit 55b4a7b6dc
5 changed files with 90 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Objects/fileobject.c
View file

@ -142,13 +142,9 @@ PyFile_WriteObject(PyObject *v, PyObject *f, int flags)
if (writer == NULL)
return -1;
if (flags & Py_PRINT_RAW) {
if (PyUnicode_Check(v)) {
value = v;
Py_INCREF(value);
} else
value = PyObject_Str(v);
value = _PyObject_Str(v);
}
else
else
value = PyObject_ReprStr8(v);
if (value == NULL) {
Py_DECREF(writer);

10
Objects/object.c
View file

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

5
Objects/typeobject.c
View file

@ -55,6 +55,11 @@ type_set_name(PyTypeObject *type, PyObject *value, void *context)
"can't delete %s.__name__", type->tp_name);
return -1;
}
if (PyUnicode_Check(value)) {
value = _PyUnicode_AsDefaultEncodedString(value, NULL);
if (value == NULL)
return -1;
}
if (!PyString_Check(value)) {
PyErr_Format(PyExc_TypeError,
"can only assign string to %s.__name__, not '%s'",

2
Objects/unicodeobject.c
View file

@ -8550,7 +8550,7 @@ static PyObject *
unicode_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
PyObject *x = NULL;
static char *kwlist[] = {"string", "encoding", "errors", 0};
static char *kwlist[] = {"object", "encoding", "errors", 0};
char *encoding = NULL;
char *errors = NULL;