Ticket #5031: kwargsPop.diff

base.py

@@ -136 +136 @@
                         # Assume object instance was passed in.
                         rel_obj = kwargs.pop(field.name)
                     except KeyError:
-                        try:
-                            # Object instance wasn't passed in -- must be an ID.
-                            val = kwargs.pop(field.attname)
-                        except KeyError:
-                            val = field.get_default()
+                        # Object instance wasn't passed in -- must be an ID.
+                        val = kwargs.pop(field.attname, field.get_default())
                     else:
                         # Object instance was passed in. Special case: You can
                         # pass in "None" for related objects if it's allowed.