diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/copy.py | 10 | ||||
| -rw-r--r-- | Lib/test/test_descr.py | 11 |
2 files changed, 16 insertions, 5 deletions
diff --git a/Lib/copy.py b/Lib/copy.py index 14eff05..86fc978 100644 --- a/Lib/copy.py +++ b/Lib/copy.py @@ -172,7 +172,7 @@ def deepcopy(x, memo = None): raise error, \ "un-deep-copyable object of type %s" % type(x) else: - y = _reconstruct(x, reductor(), 1) + y = _reconstruct(x, reductor(), 1, memo) else: y = copier(memo) else: @@ -279,10 +279,12 @@ def _deepcopy_inst(x, memo): return y d[types.InstanceType] = _deepcopy_inst -def _reconstruct(x, info, deep): +def _reconstruct(x, info, deep, memo=None): if isinstance(info, str): return x assert isinstance(info, tuple) + if memo is None: + memo = {} n = len(info) assert n in (2, 3) callable, args = info[:2] @@ -291,11 +293,11 @@ def _reconstruct(x, info, deep): else: state = {} if deep: - args = deepcopy(args) + args = deepcopy(args, memo) y = callable(*args) if state: if deep: - state = deepcopy(state) + state = deepcopy(state, memo) y.__dict__.update(state) return y diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index ea987f2..dd95dde 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -2702,7 +2702,15 @@ def strops(): vereq('%c' % 5, '\x05') vereq('%c' % '5', '5') - +def deepcopyrecursive(): + if verbose: print "Testing deepcopy of recursive objects..." + class Node: + pass + a = Node() + b = Node() + a.b = b + b.a = a + z = deepcopy(a) # This blew up before def test_main(): @@ -2759,6 +2767,7 @@ def test_main(): delhook() hashinherit() strops() + deepcopyrecursive() if verbose: print "All OK" if __name__ == "__main__": |