Changeset 2032

Timestamp:

01/17/06 11:23:18 (3 years ago)

Author:

adrian

Message:

magic-removal: Tiny code cleanups in db.models modules, and removed ManyToManyFieldNew? (which was never finished)

Files:

• django/branches/magic-removal/django/db/models/fields/__init__.py (modified) (3 diffs)
• django/branches/magic-removal/django/db/models/fields/related.py (modified) (8 diffs)
• django/branches/magic-removal/django/db/models/__init__.py (modified) (2 diffs)
• django/branches/magic-removal/django/db/models/manipulators.py (modified) (2 diffs)

django/branches/magic-removal/django/db/models/fields/__init__.py

@@ -388 +388 @@
-        return value
-
-cls, name 
+ cls, name
-        super(DateField,self).contribute_to_class(cls, name)
-        if not self.null:
@@ -712 +712 @@
-
-    def get_manipulator_fields(self, opts, manipulator, change, name_prefix='', rel=False, follow=True):
-  
+
-
-class BoundFieldLine(object):
@@ -762 +762 @@
-
-    def __repr__(self):
-(%s,
+ (%s, 
-
-    def bind(self, field_mapping, original, bound_field_set_class=BoundFieldSet):

django/branches/magic-removal/django/db/models/fields/related.py

@@ -24 +24 @@
-    other_cls = sender
-    key = (other_cls.__module__, other_cls.__name__)
-
+ 
-        field.rel.to = other_cls
-        field.do_related_class(other_cls, rel_cls)
@@ -101 +101 @@
-        Field.__init__(self, **kwargs)
-
+        self.db_index = True
+
-        for name in ('num_in_admin', 'min_num_in_admin', 'max_num_in_admin', 'num_extra_on_change'):
-            if name in kwargs:
-                self.deprecated_args.append(name)
-
-        if not self.db_index:
-            self.db_index = True
-
-    def prepare_field_objs_and_params(self, manipulator, name_prefix):
-
-
-
+
-        if self.rel.raw_id_admin:
-            field_objs = self.get_manipulator_field_objs()
@@ -125 +122 @@
-                    field_objs = [forms.SelectField]
-            params['choices'] = self.get_choices_default()
-(field_objs, params)
+field_objs, params
-
-    def get_manipulator_field_objs(self):
@@ -193 +190 @@
-        IntegerField.__init__(self, **kwargs)
-
+        self.db_index = True
+
-        for name in ('num_in_admin'):
-            if name in kwargs:
-                self.deprecated_args.append(name)
-
-        if not self.db_index:
-           self.db_index = True
-
-    def contribute_to_related_class(self, cls, related):
@@ -225 +221 @@
-                self.deprecated_args.append(name)
-
-
-        if self.rel.raw_id_admin:
-
-
-
-
-
+
+
+
+
-
-    def get_manipulator_field_objs(self):
@@ -294 +288 @@
-    def contribute_to_related_class(self, cls, related):
-        rel_obj_name = related.get_method_name_part()
- 
+
-        setattr(cls, 'get_%s_count' % rel_obj_name, curry(cls._get_related_many_to_many, method_name='get_count', rel_class=related.model, rel_field=related.field))
-        setattr(cls, 'get_%s_list' % rel_obj_name, curry(cls._get_related_many_to_many, method_name='get_list', rel_class=related.model, rel_field=related.field))
@@ -307 +301 @@
-        pass
-
-class ManyToManyFieldNew(RelatedField):
-    def __init__(self, to, **kwargs):
-        self.to = to
-        self.from_ = None
-        self.rel = self
-        self.edit_inline = False
-
-    def set_attributes_from_rel(self):
-        pass
-
-    def contribute_to_class(self, cls, name):
-        self.from_ = cls
-        self.name = name
-        super(ManyToManyFieldNew, self).contribute_to_class(cls, name)
-
-
-    def contribute_to_related_class(self, cls, name):
-        #Now we know both classes exist.
-        self.to = cls
-        # We need to wait until the class we were in was fully defined
-        dispatcher.connect(self.from_prepared, signal=signals.class_prepared, sender=self.from_)
-
-    def from_prepared(self):
-        from django.db.models.base import Model
-
-        class M2M(Model):
-            __module__ = self.from_.__module__
-
-        id_to =  self.from_._meta.db_table
-        id_from =  self.to._meta.db_table
-
-        M2M.add_to_class(id_from, ForeignKey(to=self.from_))
-        M2M.add_to_class(id_to, ForeignKey(to=self.to))
-        M2M._meta.db_table = '%s_%s' % (self.from_._meta.db_table, self.name)
-        M2M._meta.unique_together = ((id_to, id_from),)
-        M2M.__name__ = "M2M_%s_%s_%s" % (self.name, self.from_.__name__, self.to.__name__)
-
-class ManyToOne:
-    def __init__(self, to, field_name, edit_inline=False,
@@ -350 +307 @@
-            to._meta
-        except AttributeError:
- 
+
-        self.to, self.field_name = to, field_name
-        self.edit_inline = edit_inline

django/branches/magic-removal/django/db/models/__init__.py

@@ -27 +27 @@
-    if hasattr(mod, '__all__'):
-        for name in mod.__all__:
-'',
+ '', 
-            get_models_helper(sub_mod, seen_models)
-
@@ -34 +34 @@
-        comps = app_name.split('.')
-        if app_label == comps[-1]:
- , '','',
+, '', '', 
-            return app_models
-    raise ImproperlyConfigured, "App with label %s could not be found" % app_label

django/branches/magic-removal/django/db/models/manipulators.py

@@ -244 +244 @@
-#
-#        # Save inline edited objects
-
+ 
-#
-#        return new_object
@@ -437 +437 @@
-
-        prefix = '%s%s.' % (self.name_prefix, index )
- str(index), )  
+str(index),)
-
-        self[index] = child_manip