don't memoize objects that are their own copies (closes #12422)

Patch mostly by Alex Gaynor.
This commit is contained in:
Benjamin Peterson 2011-06-27 16:22:46 -05:00
parent 31877c9d0e
commit e90ec366fb
3 changed files with 27 additions and 7 deletions

View file

@ -173,8 +173,10 @@ def deepcopy(x, memo=None, _nil=[]):
"un(deep)copyable object of type %s" % cls)
y = _reconstruct(x, rv, 1, memo)
memo[d] = y
_keep_alive(x, memo) # Make sure x lives at least as long as d
# If is its own copy, don't memoize.
if y is not x:
memo[d] = y
_keep_alive(x, memo) # Make sure x lives at least as long as d
return y
_deepcopy_dispatch = d = {}
@ -214,9 +216,10 @@ def _deepcopy_tuple(x, memo):
y = []
for a in x:
y.append(deepcopy(a, memo))
d = id(x)
# We're not going to put the tuple in the memo, but it's still important we
# check for it, in case the tuple contains recursive mutable structures.
try:
return memo[d]
return memo[id(x)]
except KeyError:
pass
for i in range(len(x)):
@ -225,7 +228,6 @@ def _deepcopy_tuple(x, memo):
break
else:
y = x
memo[d] = y
return y
d[tuple] = _deepcopy_tuple