I don't know how come bytes.join() was a class method, but that's clearly

a mistake.  It's not a regular (instance) method. b".".join([b"a", b"b"])
now returns b"a.b" -- it used to return b"ab"!
This commit is contained in:
Guido van Rossum 2007-05-09 19:52:16 +00:00
parent 0925e419df
commit cd6ae68943
2 changed files with 18 additions and 10 deletions

View File

@ -466,13 +466,14 @@ class BytesTest(unittest.TestCase):
self.assertRaises(ValueError, bytes.fromhex, '12 \x00 34') self.assertRaises(ValueError, bytes.fromhex, '12 \x00 34')
def test_join(self): def test_join(self):
self.assertEqual(bytes.join([]), bytes()) self.assertEqual(b"".join([]), bytes())
self.assertEqual(bytes.join([bytes()]), bytes()) self.assertEqual(b"".join([bytes()]), bytes())
for part in [("abc",), ("a", "bc"), ("ab", "c"), ("a", "b", "c")]: for part in [("abc",), ("a", "bc"), ("ab", "c"), ("a", "b", "c")]:
lst = map(bytes, part) lst = map(bytes, part)
self.assertEqual(bytes.join(lst), bytes("abc")) self.assertEqual(b"".join(lst), bytes("abc"))
self.assertEqual(bytes.join(tuple(lst)), bytes("abc")) self.assertEqual(b"".join(tuple(lst)), bytes("abc"))
self.assertEqual(bytes.join(iter(lst)), bytes("abc")) self.assertEqual(b"".join(iter(lst)), bytes("abc"))
self.assertEqual(b".".join([b"ab", b"cd"]), b"ab.cd")
# XXX more... # XXX more...
def test_literal(self): def test_literal(self):

View File

@ -2580,15 +2580,16 @@ bytes_alloc(PyBytesObject *self)
} }
PyDoc_STRVAR(join_doc, PyDoc_STRVAR(join_doc,
"bytes.join(iterable_of_bytes) -> bytes\n\ "B.join(iterable_of_bytes) -> bytes\n\
\n\ \n\
Concatenates any number of bytes objects. Example:\n\ Concatenates any number of bytes objects, with B in between each pair.\n\
bytes.join([bytes('ab'), bytes('pq'), bytes('rs')]) -> bytes('abpqrs')."); Example: b'.'.join([b'ab', b'pq', b'rs']) -> b'ab.pq.rs'.");
static PyObject * static PyObject *
bytes_join(PyObject *cls, PyObject *it) bytes_join(PyBytesObject *self, PyObject *it)
{ {
PyObject *seq; PyObject *seq;
Py_ssize_t mysize = self->ob_size;
Py_ssize_t i; Py_ssize_t i;
Py_ssize_t n; Py_ssize_t n;
PyObject **items; PyObject **items;
@ -2613,6 +2614,8 @@ bytes_join(PyObject *cls, PyObject *it)
(long)i, obj->ob_type->tp_name); (long)i, obj->ob_type->tp_name);
goto error; goto error;
} }
if (i > 0)
totalsize += mysize;
totalsize += PyBytes_GET_SIZE(obj); totalsize += PyBytes_GET_SIZE(obj);
if (totalsize < 0) { if (totalsize < 0) {
PyErr_NoMemory(); PyErr_NoMemory();
@ -2628,6 +2631,10 @@ bytes_join(PyObject *cls, PyObject *it)
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
PyObject *obj = items[i]; PyObject *obj = items[i];
Py_ssize_t size = PyBytes_GET_SIZE(obj); Py_ssize_t size = PyBytes_GET_SIZE(obj);
if (i > 0) {
memcpy(dest, self->ob_bytes, mysize);
dest += mysize;
}
memcpy(dest, PyBytes_AS_STRING(obj), size); memcpy(dest, PyBytes_AS_STRING(obj), size);
dest += size; dest += size;
} }
@ -2775,7 +2782,7 @@ bytes_methods[] = {
{"__alloc__", (PyCFunction)bytes_alloc, METH_NOARGS, alloc_doc}, {"__alloc__", (PyCFunction)bytes_alloc, METH_NOARGS, alloc_doc},
{"fromhex", (PyCFunction)bytes_fromhex, METH_VARARGS|METH_CLASS, {"fromhex", (PyCFunction)bytes_fromhex, METH_VARARGS|METH_CLASS,
fromhex_doc}, fromhex_doc},
{"join", (PyCFunction)bytes_join, METH_O|METH_CLASS, join_doc}, {"join", (PyCFunction)bytes_join, METH_O, join_doc},
{"__reduce__", (PyCFunction)bytes_reduce, METH_NOARGS, reduce_doc}, {"__reduce__", (PyCFunction)bytes_reduce, METH_NOARGS, reduce_doc},
{NULL} {NULL}
}; };