traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
........
This commit is contained in:
Benjamin Peterson 2008-11-19 22:05:52 +00:00
parent 9c22aeebe1
commit 0f3641ce88
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/test/test_bytes.py
View File

@ -738,6 +738,16 @@ class ByteArrayTest(BaseBytesTest):
b.insert(0, Indexable(ord('A'))) b.insert(0, Indexable(ord('A')))
self.assertEqual(b, b'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): def test_partition_bytearray_doesnt_share_nullstring(self):
a, b, c = bytearray(b"x").partition(b"y") a, b, c = bytearray(b"x").partition(b"y")
self.assertEqual(b, b"") self.assertEqual(b, b"")

20
Objects/bytearrayobject.c
View File

@ -1351,7 +1351,7 @@ bytes_translate(PyByteArrayObject *self, PyObject *args)
{ {
register char *input, *output; register char *input, *output;
register const char *table; register const char *table;
register Py_ssize_t i, c, changed = 0; register Py_ssize_t i, c;
PyObject *input_obj = (PyObject*)self; PyObject *input_obj = (PyObject*)self;
const char *output_start; const char *output_start;
Py_ssize_t inlen; Py_ssize_t inlen;
@ -1397,14 +1397,8 @@ bytes_translate(PyByteArrayObject *self, PyObject *args)
/* If no deletions are required, use faster code */ /* If no deletions are required, use faster code */
for (i = inlen; --i >= 0; ) { for (i = inlen; --i >= 0; ) {
c = Py_CHARMASK(*input++); c = Py_CHARMASK(*input++);
if (Py_CHARMASK((*output++ = table[c])) != c) *output++ = table[c];
changed = 1;
} }
if (changed || !PyByteArray_CheckExact(input_obj))
goto done;
Py_DECREF(result);
Py_INCREF(input_obj);
result = input_obj;
goto done; goto done;
} }
@ -1419,13 +1413,6 @@ bytes_translate(PyByteArrayObject *self, PyObject *args)
if (trans_table[c] != -1) if (trans_table[c] != -1)
if (Py_CHARMASK(*output++ = (char)trans_table[c]) == c) if (Py_CHARMASK(*output++ = (char)trans_table[c]) == c)
continue; 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 */ /* Fix the size of the resulting string */
if (inlen > 0) if (inlen > 0)
@ -1454,8 +1441,7 @@ done:
!memcmp(target+offset+1, pattern+1, length-2) ) !memcmp(target+offset+1, pattern+1, length-2) )
/* Bytes ops must return a string. */ /* Bytes ops must return a string, create a copy */
/* If the object is subclass of bytes, create a copy */
Py_LOCAL(PyByteArrayObject *) Py_LOCAL(PyByteArrayObject *)
return_self(PyByteArrayObject *self) return_self(PyByteArrayObject *self)
{ {