commit a95eaa35f5c48417420fe37472d8148fdbf5ddd5
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

Handle merging None into lists/dicts

Signed-off-by: martin f. krafft <madduck@madduck.net>

mergers/list/extend.py

diff --git a/mergers/list/extend.py b/mergers/list/extend.py
index f4acc35..5c44ac5 100644
--- a/mergers/list/extend.py
+++ b/mergers/list/extend.py
@@ -11,8 +11,9 @@
 class ListExtend(BaseListMerger):
 
     def _combine(self, first, second):
-        if isinstance(second, list):
-            first.extend(second)
-        else:
-            first.append(second)
+        if second is not None:
+            if isinstance(second, list):
+                first.extend(second)
+            else:
+                first.append(second)
         return first