From: Guido van Rossum <guido@python.org>
Date: Mon, 12 Aug 2002 20:21:43 +0000 (+0000)
Subject: Backport:
X-Git-Tag: v2.2.2b1~223
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc1febb667872f737f45bc677025c673426a85ad;p=thirdparty%2FPython%2Fcpython.git

Backport:

Make sure that *any* object whose id() is used as a memo key is kept
alive in the memo.  This fixes SF bug 592567.
---

diff --git a/Lib/copy.py b/Lib/copy.py
index 1cb258c2f28f..eae3b6f6a673 100644
--- a/Lib/copy.py
+++ b/Lib/copy.py
@@ -185,6 +185,7 @@ def deepcopy(x, memo = None):
     else:
         y = copierfunction(x, memo)
     memo[d] = y
+    _keep_alive(x, memo) # Make sure x lives at least as long as d
     return y
 
 _deepcopy_dispatch = d = {}
@@ -269,7 +270,6 @@ def _deepcopy_inst(x, memo):
         return x.__deepcopy__(memo)
     if hasattr(x, '__getinitargs__'):
         args = x.__getinitargs__()
-        _keep_alive(args, memo)
         args = deepcopy(args, memo)
         y = apply(x.__class__, args)
     else:
@@ -278,7 +278,6 @@ def _deepcopy_inst(x, memo):
     memo[id(x)] = y
     if hasattr(x, '__getstate__'):
         state = x.__getstate__()
-        _keep_alive(state, memo)
     else:
         state = x.__dict__
     state = deepcopy(state, memo)