Merge pull request #14 from toudi/master

Fix for 'NoneType' is not iterable
fwenzel · Feb 10, 2013 · 5638152 · 5638152
2 parents 24de857 + 75abc7f
commit 5638152
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/django_gearman/models.py b/django_gearman/models.py
@@ -56,7 +56,10 @@ def parse_data(self, arg, args=None, kwargs=None, *arguments, **karguments):
             data["args"] = args
 
         data["kwargs"].update(karguments)
-        data["kwargs"].update(kwargs)
+        # We must ensure if kwargs actually exist,
+        # Otherwise 'NoneType' is not iterable is thrown
+        if kwargs:
+            data["kwargs"].update(kwargs)
 
         return data