diff options
| author | Guido van Rossum <guido@python.org> | 2006-07-27 21:53:35 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2006-07-27 21:53:35 +0000 |
| commit | 3cf5b1eef99fbd85bbd2bcd2e6223dfec92daf8b (patch) | |
| tree | 310222781e7a80027e813b9e61b9b412fecc9a87 /Objects/bytesobject.c | |
| parent | 73e5a5b65d66f4fba9c4f626bcd6400f4a7215e6 (diff) | |
| download | cpython-git-3cf5b1eef99fbd85bbd2bcd2e6223dfec92daf8b.tar.gz | |
Get rid of most of the flags (in tp_flags) that keep track of various
variations of the type struct and its attachments. In Py3k, all type
structs have to have all fields -- no binary backwards compatibility.
Had to change the complex object to a new-style number!
Diffstat (limited to 'Objects/bytesobject.c')
| -rw-r--r-- | Objects/bytesobject.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index f335abe8d3..7bcca8a4b6 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -743,8 +743,9 @@ bytes_join(PyObject *cls, PyObject *it) if (!PyBytes_Check(obj)) { PyErr_Format(PyExc_TypeError, "can only join an iterable of bytes " - "(item %d has type '%.100s')", - i, obj->ob_type->tp_name); + "(item %ld has type '%.100s')", + /* XXX %ld isn't right on Win64 */ + (long)i, obj->ob_type->tp_name); goto error; } totalsize += PyBytes_GET_SIZE(obj); @@ -838,7 +839,7 @@ PyTypeObject PyBytes_Type = { PyObject_GenericGetAttr, /* tp_getattro */ 0, /* tp_setattro */ &bytes_as_buffer, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_CHECKTYPES, /* tp_flags */ + Py_TPFLAGS_DEFAULT, /* tp_flags */ /* bytes is 'final' or 'sealed' */ bytes_doc, /* tp_doc */ 0, /* tp_traverse */ |