| commit | a95eaa35f5c48417420fe37472d8148fdbf5ddd5 | [log] [tgz] |
|---|---|---|
| author | martin f. krafft <madduck@madduck.net> | Sun Jun 16 11:56:41 2013 +0200 |
| committer | martin f. krafft <madduck@madduck.net> | Sun Jun 16 11:56:41 2013 +0200 |
| tree | 1d5bd053ad8deacda62570b1cc1ced986b0c99a0 | |
| parent | a07b4208dcf30cdab35a8021c54a767f0b47cf3c [diff] [blame] |
Handle merging None into lists/dicts Signed-off-by: martin f. krafft <madduck@madduck.net>
diff --git a/mergers/dict/recursive_update.py b/mergers/dict/recursive_update.py index ba94c1f..fc1d425 100644 --- a/mergers/dict/recursive_update.py +++ b/mergers/dict/recursive_update.py
@@ -11,6 +11,9 @@ class DictRecursiveUpdate(BaseDictMerger): def merge(self, first, second): + if second is None: + return first + ret = first.copy() for k,v in second.iteritems(): if k in ret: