Ticket #1559: always_process_defaults.diff

__init__.py

@@ -944 +944 @@
 # CORE METHODS #############################
 
 def method_init(opts, self, *args, **kwargs):
-    if kwargs:
-        for f in opts.fields:
-            if isinstance(f.rel, ManyToOne):
+    for f in opts.fields:
+        if isinstance(f.rel, ManyToOne):
+            try:
+                # Assume object instance was passed in.
+                rel_obj = kwargs.pop(f.name)
+            except KeyError:
                 try:
-                    # Assume object instance was passed in.
-                    rel_obj = kwargs.pop(f.name)
+                    # Object instance wasn't passed in -- must be an ID.
+                    val = kwargs.pop(f.attname)
                 except KeyError:
-                    try:
-                        # Object instance wasn't passed in -- must be an ID.
-                        val = kwargs.pop(f.attname)
-                    except KeyError:
-                        val = f.get_default()
-                else:
-                    # Object instance was passed in.
-                    # Special case: You can pass in "None" for related objects if it's allowed.
-                    if rel_obj is None and f.null:
-                        val = None
-                    else:
-                        try:
-                            val = getattr(rel_obj, f.rel.get_related_field().attname)
-                        except AttributeError:
-                            raise TypeError, "Invalid value: %r should be a %s instance, not a %s" % (f.name, f.rel.to, type(rel_obj))
-                setattr(self, f.attname, val)
+                    val = f.get_default()
             else:
-                val = kwargs.pop(f.attname, f.get_default())
-                setattr(self, f.attname, val)
-        if kwargs:
-            raise TypeError, "'%s' is an invalid keyword argument for this function" % kwargs.keys()[0]
+                # Object instance was passed in.
+                # Special case: You can pass in "None" for related objects if it's allowed.
+                if rel_obj is None and f.null:
+                    val = None
+                else:
+                    try:
+                        val = getattr(rel_obj, f.rel.get_related_field().attname)
+                    except AttributeError:
+                        raise TypeError, "Invalid value: %r should be a %s instance, not a %s" % (f.name, f.rel.to, type(rel_obj))
+            setattr(self, f.attname, val)
+        else:
+            val = kwargs.pop(f.attname, f.get_default())
+            setattr(self, f.attname, val)
+    if kwargs:
+        raise TypeError, "'%s' is an invalid keyword argument for this function" % kwargs.keys()[0]
     for i, arg in enumerate(args):
         setattr(self, opts.fields[i].attname, arg)