mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 13:41:24 +00:00 
			
		
		
		
	#8401: merge with 3.3.
This commit is contained in:
		
						commit
						212843b29f
					
				
					 3 changed files with 27 additions and 0 deletions
				
			
		|  | @ -885,6 +885,24 @@ def test_setslice(self): | |||
|         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: | ||||
|  |  | |||
|  | @ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1? | |||
| Core and Builtins | ||||
| ----------------- | ||||
| 
 | ||||
| - Issue #8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) now | ||||
|   raises an error. | ||||
| 
 | ||||
| - Issue #7317: Display full tracebacks when an error occurs asynchronously. | ||||
|   Patch by Alon Horev with update by Alexey Kachayev. | ||||
| 
 | ||||
|  |  | |||
|  | @ -589,6 +589,12 @@ bytearray_ass_subscript(PyByteArrayObject *self, PyObject *index, PyObject *valu | |||
|         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); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Ezio Melotti
						Ezio Melotti