Index: Lib/copy.py =================================================================== --- Lib/copy.py (revisione 81143) +++ Lib/copy.py (copia locale) @@ -328,17 +328,7 @@ 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 @@ 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 @@ 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() Index: Lib/test/test_copy.py =================================================================== --- Lib/test/test_copy.py (revisione 81143) +++ Lib/test/test_copy.py (copia locale) @@ -526,6 +526,24 @@ 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={}): + self._keys = d.keys() + super(C, self).__init__(d) + def __setitem__(self, key, item): + super(C, self).__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