diff options
| author | Thomas Wouters <thomas@python.org> | 2006-08-24 18:40:20 +0000 |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2006-08-24 18:40:20 +0000 |
| commit | 9e398cac94cd15385e79d70e3575fd2945e0b76d (patch) | |
| tree | 2e362d842714d0b4cdee0775116bb6ab2180b09d | |
| parent | 348dc88097412cc229254f20f2759ce4cd192261 (diff) | |
| download | cpython-git-9e398cac94cd15385e79d70e3575fd2945e0b76d.tar.gz | |
Fix SF bug #1545837: array.array borks on deepcopy.
array.__deepcopy__() needs to take an argument, even if it doesn't actually
use it. Will backport to 2.5 and 2.4 (if applicable.)
| -rwxr-xr-x | Lib/test/test_array.py | 7 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Modules/arraymodule.c | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py index 62361fce8c..06f13cd2b7 100755 --- a/Lib/test/test_array.py +++ b/Lib/test/test_array.py @@ -85,6 +85,13 @@ class BaseTest(unittest.TestCase): self.assertNotEqual(id(a), id(b)) self.assertEqual(a, b) + def test_deepcopy(self): + import copy + a = array.array(self.typecode, self.example) + b = copy.deepcopy(a) + self.assertNotEqual(id(a), id(b)) + self.assertEqual(a, b) + def test_pickle(self): for protocol in (0, 1, 2): a = array.array(self.typecode, self.example) @@ -242,6 +242,7 @@ Dag Gruneau Michael Guravage Lars Gustäbel Barry Haddow +Václav Haisman Paul ten Hagen Rasmus Hahn Peter Haight diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c index efa7835c37..9de14fd060 100644 --- a/Modules/arraymodule.c +++ b/Modules/arraymodule.c @@ -1495,7 +1495,7 @@ PyMethodDef array_methods[] = { copy_doc}, {"count", (PyCFunction)array_count, METH_O, count_doc}, - {"__deepcopy__",(PyCFunction)array_copy, METH_NOARGS, + {"__deepcopy__",(PyCFunction)array_copy, METH_O, copy_doc}, {"extend", (PyCFunction)array_extend, METH_O, extend_doc}, |