review comments

Author: eendebakpt

Lib/copy.py

@@ -166,7 +166,7 @@ def deepcopy(x, memo=None):
           int, float, bool, complex, bytes, str, types.CodeType, type, range,
           types.BuiltinFunctionType, types.FunctionType, weakref.ref, property})
 
-d = {}
+_deepcopy_dispatch = d = {}
 
 
 def _deepcopy_list(x, memo, deepcopy=deepcopy):
@@ -212,7 +212,6 @@ def _deepcopy_method(x, memo): # Copy instance methods
     return type(x)(x.__func__, deepcopy(x.__self__, memo))
 d[types.MethodType] = _deepcopy_method
 
-_deepcopy_dispatch = frozendict(d)
 del d
 
 def _keep_alive(x, memo):

Lib/test/test_descr.py

@@ -311,7 +311,12 @@ def test_spam_lists(self):
         # Testing spamlist operations...
         import copy, xxsubtype as spam
 
-        spamlist = spam.spamlist
+        def spamlist(l, memo=None):
+            import xxsubtype as spam
+            return spam.spamlist(l)
+
+        # This is an ugly hack:
+        copy._deepcopy_dispatch[spam.spamlist] = spamlist
 
         self.binop_test(spamlist([1]), spamlist([2]), spamlist([1,2]), "a+b",
                        "__add__")
@@ -345,22 +350,19 @@ def foo(self): return 1
         a.setstate(42)
         self.assertEqual(a.getstate(), 42)
 
-        # test deepcopy makes a deep copy of the elements of a spamlist
-        a.append([])
-        a_copy = copy.deepcopy(a)
-        assert a_copy is not a
-        assert a_copy[-1] is not a[-1]
-        assert a_copy == a
-        # the spamlist does not explictly implement deepcopy, the state is not copied
-        assert a_copy.getstate() != a.getstate()
-
     @support.impl_detail("the module 'xxsubtype' is internal")
     @unittest.skipIf(xxsubtype is None, "requires xxsubtype module")
     def test_spam_dicts(self):
         # Testing spamdict operations...
         import copy, xxsubtype as spam
-
-        spamdict = spam.spamdict
+        def spamdict(d, memo=None):
+            import xxsubtype as spam
+            sd = spam.spamdict()
+            for k, v in list(d.items()):
+                sd[k] = v
+            return sd
+        # This is an ugly hack:
+        copy._deepcopy_dispatch[spam.spamdict] = spamdict
 
         self.binop_test(spamdict({1:2,3:4}), 1, 1, "b in a", "__contains__")
         self.binop_test(spamdict({1:2,3:4}), 2, 0, "b in a", "__contains__")
@@ -399,15 +401,6 @@ def foo(self): return 1
         a.setstate(100)
         self.assertEqual(a.getstate(), 100)
 
-        # test deepcopy makes a deep copy of the elements of a spamdict
-        a[-1] = []
-        a_copy = copy.deepcopy(a)
-        assert a_copy is not a
-        assert a_copy[-1] is not a[-1]
-        assert a_copy == a
-        # the spamdict does not explictly implement deepcopy, the state is not copied
-        assert a_copy.getstate() != a.getstate()
-
     def test_wrap_lenfunc_bad_cast(self):
         self.assertEqual(range(sys.maxsize).__len__(), sys.maxsize)