diff options
author | Benjamin Peterson <benjamin@python.org> | 2008-11-19 22:05:53 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2008-11-19 22:05:53 (GMT) |
commit | 866eba940f1ff9cf2ddf10dacb39e3721e2d6a9a (patch) | |
tree | 9c25d4fe6aa5a1fbd092dea867ceff0bb5d7046f | |
parent | 6df732777c682c5cdf74cd3b1b9d2be151f544ca (diff) | |
download | cpython-866eba940f1ff9cf2ddf10dacb39e3721e2d6a9a.zip cpython-866eba940f1ff9cf2ddf10dacb39e3721e2d6a9a.tar.gz cpython-866eba940f1ff9cf2ddf10dacb39e3721e2d6a9a.tar.bz2 |
Merged revisions 67291 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67291 | benjamin.peterson | 2008-11-19 15:49:09 -0600 (Wed, 19 Nov 2008) | 5 lines
make sure that bytearray methods return a new bytearray even if there is no change
Fixes #4348
Reviewed by Brett
........
-rw-r--r-- | Lib/test/test_bytes.py | 10 | ||||
-rw-r--r-- | Misc/NEWS | 3 | ||||
-rw-r--r-- | Objects/bytearrayobject.c | 24 |
3 files changed, 16 insertions, 21 deletions
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py index a583a48..6e5ffa9 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -721,6 +721,16 @@ class ByteArrayTest(BaseBytesTest): b.insert(0, Indexable(ord('A'))) self.assertEqual(b, b'A') + def test_copied(self): + # Issue 4348. Make sure that operations that don't mutate the array + # copy the bytes. + b = bytearray(b'abc') + #self.assertFalse(b is b.replace(b'abc', b'cde', 0)) + + t = bytearray([i for i in range(256)]) + x = bytearray(b'') + self.assertFalse(x is x.translate(t)) + def test_partition_bytearray_doesnt_share_nullstring(self): a, b, c = bytearray(b"x").partition(b"y") self.assertEqual(b, b"") @@ -12,6 +12,9 @@ What's New in Python 2.6.1 alpha 1 Core and Builtins ----------------- +- Issue #4348: Some bytearray methods returned that didn't cause any change to + the bytearray, returned the same bytearray instead of a copy. + - Issue #4317: Fixed a crash in the imageop.rgb2rgb8() function. - Issue #4230: If ``__getattr__`` is a descriptor, it now functions correctly. diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index c4fc37f..99bb0f2 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -1423,7 +1423,7 @@ bytes_translate(PyByteArrayObject *self, PyObject *args) { register char *input, *output; register const char *table; - register Py_ssize_t i, c, changed = 0; + register Py_ssize_t i, c; PyObject *input_obj = (PyObject*)self; const char *output_start; Py_ssize_t inlen; @@ -1469,14 +1469,8 @@ bytes_translate(PyByteArrayObject *self, PyObject *args) /* If no deletions are required, use faster code */ for (i = inlen; --i >= 0; ) { c = Py_CHARMASK(*input++); - if (Py_CHARMASK((*output++ = table[c])) != c) - changed = 1; + *output++ = table[c]; } - if (changed || !PyByteArray_CheckExact(input_obj)) - goto done; - Py_DECREF(result); - Py_INCREF(input_obj); - result = input_obj; goto done; } @@ -1491,13 +1485,6 @@ bytes_translate(PyByteArrayObject *self, PyObject *args) if (trans_table[c] != -1) if (Py_CHARMASK(*output++ = (char)trans_table[c]) == c) continue; - changed = 1; - } - if (!changed && PyByteArray_CheckExact(input_obj)) { - Py_DECREF(result); - Py_INCREF(input_obj); - result = input_obj; - goto done; } /* Fix the size of the resulting string */ if (inlen > 0) @@ -1526,15 +1513,10 @@ done: !memcmp(target+offset+1, pattern+1, length-2) ) -/* Bytes ops must return a string. */ -/* If the object is subclass of bytes, create a copy */ +/* Bytes ops must return a string, create a copy */ Py_LOCAL(PyByteArrayObject *) return_self(PyByteArrayObject *self) { - if (PyByteArray_CheckExact(self)) { - Py_INCREF(self); - return (PyByteArrayObject *)self; - } return (PyByteArrayObject *)PyByteArray_FromStringAndSize( PyByteArray_AS_STRING(self), PyByteArray_GET_SIZE(self)); |