Changeset 1182

Timestamp:

03/07/10 08:43:40 (6 months ago)

Author:

gray

Message:

merge_dict_from_to was causing d1 (the from dict) to be modified because it was just assigning the value from d1 to d2, even though the value could be a reference to a deeper structure. so both d1 and d2 would share the same object. the solution is to do a deep copy on the value from d1 before assigning it to d2 so d2 can modify it without d1 being affected.

Files:

• trunk/flexget/utils/tools.py (modified) (3 diffs)

trunk/flexget/utils/tools.py

@@ -142 +142 @@
 def merge_dict_from_to(d1, d2):
     """Merges dictionary d1 into dictionary d2. d1 will remain in original form."""
+    import copy
     for k, v in d1.items():
         if k in d2:
@@ -148 +149 @@
                     merge_dict_from_to(d1[k], d2[k])
                 elif isinstance(v, list):
-                    d2[k].extend(v)
+                    d2[k].extend(copy.deepcopy(v))
                 elif isinstance(v, basestring) or isinstance(v, bool) or \
                      isinstance(v, int) or isinstance(v, float):
@@ -157 +158 @@
                 raise MergeException('Merging key %s failed, conflicting datatypes.' % (k))
         else:
-            d2[k] = v
+            d2[k] = copy.deepcopy(v)