2011-07-05 | Paul Boddie | raw files shortlog changelog graph | Simplified ObjectSet merging which seemed to be attempting to combine individual values. | |
micropython/common.py (file) |
1.1 --- a/micropython/common.py Tue Jul 05 00:36:54 2011 +0200 1.2 +++ b/micropython/common.py Tue Jul 05 00:37:58 2011 +0200 1.3 @@ -124,9 +124,7 @@ 1.4 if not self.has_key(key): 1.5 merged[key] = other[key] 1.6 else: 1.7 - for other_value in other[key]: 1.8 - for value in self[key]: 1.9 - merged[key] = value + other_value 1.10 + merged[key] = self[key] + other[key] 1.11 1.12 for key in self.keys(): 1.13 if not merged.has_key(key):