diff options
Diffstat (limited to 'Lib/copy.py')
| -rw-r--r-- | Lib/copy.py | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/Lib/copy.py b/Lib/copy.py index bbbd5b3313..c227a2e5c7 100644 --- a/Lib/copy.py +++ b/Lib/copy.py @@ -328,17 +328,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) @@ -354,6 +344,18 @@ def _reconstruct(x, info, deep, memo=None): if slotstate is not None: for key, value in slotstate.iteritems(): 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 @@ -416,6 +418,16 @@ def _test(): print map(repr.repr, l1) print map(repr.repr, l2) print map(repr.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() |