thomas.wouters · thomas.wouters · commit 9ca6d12fd78c · 2006-08-24T18:40:20.000Z
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.) git-svn-id: http://svn.python.org/projects/python/trunk@51565 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py
@@ -85,6 +85,13 @@ def test_copy(self):
         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)
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -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
@@ -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},
