diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-05-26 13:22:05 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-05-26 13:22:05 (GMT) |
| commit | 9c4756ea265b5ebd71c9ae59f3673c7cecb6f060 (patch) | |
| tree | 642b21e774a9cb2d949e10ce65e7d10326c70138 /Objects/stringobject.c | |
| parent | 96d02f3c1e145821cd5ce8817d4263e7d8d57e4a (diff) | |
| download | cpython-9c4756ea265b5ebd71c9ae59f3673c7cecb6f060.zip cpython-9c4756ea265b5ebd71c9ae59f3673c7cecb6f060.tar.gz cpython-9c4756ea265b5ebd71c9ae59f3673c7cecb6f060.tar.bz2 | |
Renamed PyBytes to PyByteArray
Diffstat (limited to 'Objects/stringobject.c')
| -rw-r--r-- | Objects/stringobject.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 0cc48c3..70f3a6c 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -1469,7 +1469,7 @@ string_join(PyObject *self, PyObject *orig) for (i = 0; i < seqlen; i++) { const size_t old_sz = sz; item = PySequence_Fast_GET_ITEM(seq, i); - if (!PyString_Check(item) && !PyBytes_Check(item)) { + if (!PyString_Check(item) && !PyByteArray_Check(item)) { PyErr_Format(PyExc_TypeError, "sequence item %zd: expected bytes," " %.80s found", @@ -1496,7 +1496,7 @@ string_join(PyObject *self, PyObject *orig) } /* Catenate everything. */ - /* I'm not worried about a PyBytes item growing because there's + /* I'm not worried about a PyByteArray item growing because there's nowhere in this function where we release the GIL. */ p = PyString_AS_STRING(res); for (i = 0; i < seqlen; ++i) { @@ -1511,7 +1511,7 @@ string_join(PyObject *self, PyObject *orig) if (PyString_Check(item)) q = PyString_AS_STRING(item); else - q = PyBytes_AS_STRING(item); + q = PyByteArray_AS_STRING(item); Py_MEMCPY(p, q, n); p += n; } |