[Python-checkins] cpython (merge 3.2 -> 3.3): #8401: merge with 3.2.
ezio.melotti
python-checkins at python.org
Sat Nov 3 20:25:08 CET 2012
http://hg.python.org/cpython/rev/06577f6b1c99
changeset: 80210:06577f6b1c99
branch: 3.3
parent: 80204:5982a6ea124f
parent: 80209:8f00af8abaf9
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Sat Nov 03 21:22:41 2012 +0200
summary:
#8401: merge with 3.2.
files:
Lib/test/test_bytes.py | 18 ++++++++++++++++++
Misc/NEWS | 3 +++
Objects/bytearrayobject.c | 6 ++++++
3 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -871,6 +871,24 @@
b[3:0] = [42, 42, 42]
self.assertEqual(b, bytearray([0, 1, 2, 42, 42, 42, 3, 4, 5, 6, 7, 8, 9]))
+ b[3:] = b'foo'
+ self.assertEqual(b, bytearray([0, 1, 2, 102, 111, 111]))
+
+ b[:3] = memoryview(b'foo')
+ self.assertEqual(b, bytearray([102, 111, 111, 102, 111, 111]))
+
+ b[3:4] = []
+ self.assertEqual(b, bytearray([102, 111, 111, 111, 111]))
+
+ for elem in [5, -5, 0, int(10e20), 'str', 2.3,
+ ['a', 'b'], [b'a', b'b'], [[]]]:
+ with self.assertRaises(TypeError):
+ b[3:4] = elem
+
+ for elem in [[254, 255, 256], [-256, 9000]]:
+ with self.assertRaises(ValueError):
+ b[3:4] = elem
+
def test_extended_set_del_slice(self):
indices = (0, None, 1, 3, 19, 300, 1<<333, -1, -2, -31, -300)
for start in indices:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
Core and Builtins
-----------------
+- Issue #8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) now
+ raises an error.
+
- Fix segfaults on setting __qualname__ on builtin types and attempting to
delete it on any type.
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -589,6 +589,12 @@
needed = 0;
}
else if (values == (PyObject *)self || !PyByteArray_Check(values)) {
+ if (PyNumber_Check(values) || PyUnicode_Check(values)) {
+ PyErr_SetString(PyExc_TypeError,
+ "can assign only bytes, buffers, or iterables "
+ "of ints in range(0, 256)");
+ return -1;
+ }
/* Make a copy and call this function recursively */
int err;
values = PyByteArray_FromObject(values);
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list