Changeset 7504

Timestamp:

04/28/08 20:19:42 (2 months ago)

Author:

mtredinnick

Message:

Undo [7474]. I didn't think it through nearly carefully enough.

This means that all model construction now goes through the init() method
again.

Files:

• django/trunk/django/db/models/base.py (modified) (1 diff)
• django/trunk/django/db/models/query.py (modified) (2 diffs)

django/trunk/django/db/models/base.py

@@ -238 +238 @@
-        dispatcher.send(signal=signals.post_init, sender=self.__class__, instance=self)
-
-    def from_sequence(cls, values):
-        """
-        An alternate class constructor, primarily for internal use.
-
-        Creates a model instance from a sequence of values (which corresponds
-        to all the non-many-to-many fields in creation order. If there are more
-        fields than values, the remaining (final) fields are given their
-        default values.
-
-        ForeignKey fields can only be initialised using id values, not
-        instances, in this method.
-        """
-        dispatcher.send(signal=signals.pre_init, sender=cls, args=values,
-                kwargs={})
-        obj = Empty()
-        obj.__class__ = cls
-        field_iter = iter(obj._meta.fields)
-        for val, field in izip(values, field_iter):
-            setattr(obj, field.attname, val)
-        for field in field_iter:
-            setattr(obj, field.attname, field.get_default())
-        dispatcher.send(signal=signals.post_init, sender=cls, instance=obj)
-        return obj
-
-    from_sequence = classmethod(from_sequence)
-
-    def __repr__(self):
-        return smart_str(u'<%s: %s>' % (self.__class__.__name__, unicode(self)))

django/trunk/django/db/models/query.py

@@ -165 +165 @@
-                        max_depth, requested=requested)
-            else:
-.from_sequence(
+(*
-            for i, k in enumerate(extra_select):
-                setattr(obj, k, row[i])
@@ -656 +656 @@
-    restricted = requested is not None
-    index_end = index_start + len(klass._meta.fields)
-.from_sequence(
+(*
-    for f in klass._meta.fields:
-        if (not f.rel or (not restricted and f.null) or