diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/copy.py | 37 | ||||
| -rw-r--r-- | Lib/test/test_copy.py | 20 |
2 files changed, 45 insertions, 12 deletions
diff --git a/Lib/copy.py b/Lib/copy.py index 2646350..4b75511 100644 --- a/Lib/copy.py +++ b/Lib/copy.py @@ -51,6 +51,7 @@ __getstate__() and __setstate__(). See the documentation for module import types import weakref from copyreg import dispatch_table +import builtins class Error(Exception): pass @@ -109,7 +110,7 @@ t = getattr(types, "CodeType", None) if t is not None: d[t] = _copy_immutable for name in ("complex", "unicode"): - t = globals()['__builtins__'].get(name) + t = getattr(builtins, name, None) if t is not None: d[t] = _copy_immutable @@ -279,17 +280,7 @@ def _reconstruct(x, info, deep, memo=None): args = deepcopy(args, memo) y = callable(*args) memo[id(x)] = y - if listiter is not None: - for item in listiter: - if deep: - item = deepcopy(item, memo) - y.append(item) - if dictiter is not None: - for key, value in dictiter: - if deep: - key = deepcopy(key, memo) - value = deepcopy(value, memo) - y[key] = value + if state: if deep: state = deepcopy(state, memo) @@ -305,6 +296,18 @@ def _reconstruct(x, info, deep, memo=None): if slotstate is not None: for key, value in slotstate.items(): setattr(y, key, value) + + if listiter is not None: + for item in listiter: + if deep: + item = deepcopy(item, memo) + y.append(item) + if dictiter is not None: + for key, value in dictiter: + if deep: + key = deepcopy(key, memo) + value = deepcopy(value, memo) + y[key] = value return y del d @@ -366,6 +369,16 @@ def _test(): print(map(reprlib.repr, l1)) print(map(reprlib.repr, l2)) print(map(reprlib.repr, l3)) + class odict(dict): + def __init__(self, d = {}): + self.a = 99 + dict.__init__(self, d) + def __setitem__(self, k, i): + dict.__setitem__(self, k, i) + self.a + o = odict({"A" : "B"}) + x = deepcopy(o) + print(o, x) if __name__ == '__main__': _test() diff --git a/Lib/test/test_copy.py b/Lib/test/test_copy.py index 2af2109..f4ca6b3 100644 --- a/Lib/test/test_copy.py +++ b/Lib/test/test_copy.py @@ -532,6 +532,26 @@ class TestCopy(unittest.TestCase): self.assertEqual(x.foo, y.foo) self.assertTrue(x.foo is not y.foo) + def test_deepcopy_dict_subclass(self): + class C(dict): + def __init__(self, d=None): + if not d: + d = {} + self._keys = list(d.keys()) + super().__init__(d) + def __setitem__(self, key, item): + super().__setitem__(key, item) + if key not in self._keys: + self._keys.append(key) + x = C(d={'foo':0}) + y = copy.deepcopy(x) + self.assertEqual(x, y) + self.assertEqual(x._keys, y._keys) + self.assertTrue(x is not y) + x['bar'] = 1 + self.assertNotEqual(x, y) + self.assertNotEqual(x._keys, y._keys) + def test_copy_list_subclass(self): class C(list): pass |