Changeset 1713

Timestamp:

12/16/05 20:10:33 (3 years ago)

Author:

rjwittams

Message:

Moved magic method addition to fields

Files:

• django/branches/magic-removal/django/db/models/base.py (modified) (10 diffs)
• django/branches/magic-removal/django/db/models/fields/__init__.py (modified) (4 diffs)
• django/branches/magic-removal/django/db/models/fields/related.py (modified) (2 diffs)

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

@@ -175 +175 @@
-    def _prepare(cls):
-        # Creates some methods once self._meta has been populated.
-        for f in cls._meta.fields:
-            if f.choices:
-                setattr(cls, 'get_%s_display' % f.name, curry(cls.__get_FIELD_display, field=f))
-            if isinstance(f, DateField):
-                if not f.null:
-                    setattr(cls, 'get_next_by_%s' % f.name, curry(cls.__get_next_or_previous_by_FIELD, field=f, is_next=True))
-                    setattr(cls, 'get_previous_by_%s' % f.name, curry(cls.__get_next_or_previous_by_FIELD, field=f, is_next=False))
-            elif isinstance(f, FileField):
-                setattr(cls, 'get_%s_filename' % f.name, curry(cls.__get_FIELD_filename, field=f))
-                setattr(cls, 'get_%s_url' % f.name, curry(cls.__get_FIELD_url, field=f))
-                setattr(cls, 'get_%s_size' % f.name, curry(cls.__get_FIELD_size, field=f))
-                setattr(cls, 'save_%s_file' % f.name, curry(cls.__save_FIELD_file, field=f))
-                if isinstance(f, ImageField):
-                    # Add get_BLAH_width and get_BLAH_height methods, but only
-                    # if the image field doesn't have width and height cache
-                    # fields.
-                    if not f.width_field:
-                        setattr(cls, 'get_%s_width' % f.name, curry(cls.__get_FIELD_width, field=f))
-                    if not f.height_field:
-                        setattr(cls, 'get_%s_height' % f.name, curry(cls.__get_FIELD_height, field=f))
-
-
-            # Add methods for many-to-one related objects.
-            # EXAMPLES: Choice.get_poll(), Story.get_dateline()
-            if isinstance(f.rel, ManyToOne):
-                setattr(cls, 'get_%s' % f.name, curry(cls.__get_foreign_key_object, field_with_rel=f))
-
-        # Create the default class methods.
-        for f in cls._meta.many_to_many:
-            # Add "get_thingie" methods for many-to-many related objects.
-            # EXAMPLES: Poll.get_site_list(), Story.get_byline_list()
-            setattr(cls, 'get_%s_list' % f.rel.singular, curry(cls.__get_many_to_many_objects, field_with_rel=f))
-
-            # Add "set_thingie" methods for many-to-many related objects.
-            # EXAMPLES: Poll.set_sites(), Story.set_bylines()
-            setattr(cls, 'set_%s' % f.name, curry(cls.__set_many_to_many_objects, field_with_rel=f))
-
-        if cls._meta.order_with_respect_to:
-_
-_
+
+
-
-        RelatedField.do_pending_lookups(cls)
@@ -364 +328 @@
-
-
-_
+
-        value = getattr(self, field.attname)
-        return dict(field.choices).get(value, value)
-
-_
+
-        op = is_next and '>' or '<'
-        kwargs.setdefault('where', []).append('(%s %s %%s OR (%s = %%s AND %s.%s %s %%s))' % \
@@ -379 +343 @@
-        return self.__class__._default_manager.get_object(**kwargs)
-
-_
+
-        cachename = "__%s_order_cache" % is_next
-        if not hasattr(self, cachename):
@@ -394 +358 @@
-        return getattr(self, cachename)
-
-_
+
-        return os.path.join(settings.MEDIA_ROOT, getattr(self, field.attname))
-
-_
+
-        if getattr(self, field.attname): # value is not blank
-            import urlparse
@@ -403 +367 @@
-        return ''
-
-_
+
-        return os.path.getsize(self.__get_FIELD_filename(field))
-
-_
+
-        directory = field.get_directory_name()
-        try: # Create the date-based directory if it doesn't exist.
@@ -444 +408 @@
-        self.save()
-
-_
-
-_
+
+
+
-        return self.__get_image_dimensions(field)[0]
-
-_
+
-        return self.__get_image_dimensions(field)[1]
-
-_
+
-        cachename = "__%s_dimensions_cache" % field.name
-        if not hasattr(self, cachename):
@@ -460 +424 @@
-        return getattr(self, cachename)
-
-_
+
-        cache_var = field_with_rel.get_cache_name()
-        if not hasattr(self, cache_var):
@@ -475 +439 @@
-        return getattr(self, cache_var)
-
-_
+
-        cache_var = '_%s_cache' % field_with_rel.name
-        if not hasattr(self, cache_var):
@@ -491 +455 @@
-        return getattr(self, cache_var)
-
-_
-_
+
+
-        ids_to_add, ids_to_delete = dict([(i, 1) for i in id_list]), []
-        for current_id in current_ids:
@@ -526 +490 @@
-        return True
-
-_
+
-
-    def _get_related(self, method_name, rel_class, rel_field, **kwargs):

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

@@ -121 +121 @@
-        return cmp(self.creation_counter, other.creation_counter)
-
-contribute_to_class(self, cls
+set_attributes_from_name(self
-        self.name = name
-        self.attname, self.column = self.get_attname_column()
-        self.verbose_name = self.verbose_name or (name and name.replace('_', ' '))
+
+    def contribute_to_class(self, cls, name):
+        self.set_attributes_from_name(name)
-        cls._meta.add_field(self)
+        if self.choices:
+            setattr(cls, 'get_%s_display' % self.name, curry(cls._get_FIELD_display, field=self))
-
-    def set_name(self, name):
@@ -375 +380 @@
-            return datetime.datetime.now()
-        return value
+
+    def contribute_to_class(self,cls, name ):
+        super(DateField,self).contribute_to_class(cls, name)
+        if not self.null:
+            setattr(cls, 'get_next_by_%s' % self.name, 
+                     curry(cls._get_next_or_previous_by_FIELD, field=self, is_next=True))
+            setattr(cls, 'get_previous_by_%s' % self.name, 
+                     curry(cls._get_next_or_previous_by_FIELD, field=self, is_next=False)) 
-
-    # Needed because of horrible auto_now[_add] behaviour wrt. editable
@@ -484 +497 @@
-        return field_list
-
+    def contribute_to_class(self, cls, name):
+        super(FileField, self).contribute_to_class(cls, name)
+        setattr(cls, 'get_%s_filename' % self.name, curry(cls._get_FIELD_filename, field=self))
+        setattr(cls, 'get_%s_url' % self.name, curry(cls._get_FIELD_url, field=self))
+        setattr(cls, 'get_%s_size' % self.name, curry(cls._get_FIELD_size, field=self))
+        setattr(cls, 'save_%s_file' % self.name, curry(cls._save_FIELD_file, field=self))
+
-    def get_manipulator_field_objs(self):
-        return [formfields.FileUploadField, formfields.HiddenField]
@@ -531 +551 @@
-    def get_manipulator_field_objs(self):
-        return [formfields.ImageUploadField, formfields.HiddenField]
+
+    def contribute_to_class(self, cls, name):
+        super(FileField, self).contribute_to_class(cls, name)
+        # Add get_BLAH_width and get_BLAH_height methods, but only
+        # if the image field doesn't have width and height cache
+        # fields.
+        if not self.width_field:
+            setattr(cls, 'get_%s_width' % self.name, curry(cls._get_FIELD_width, field=self))
+        if not self.height_field:
+            setattr(cls, 'get_%s_height' % self.name, curry(cls._get_FIELD_height, field=self))
-
-    def save_file(self, new_data, new_object, original_object, change, rel):

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

@@ -58 +58 @@
-        return '%s__%s__exact' % (self.name, self.rel.get_related_field().name)
-
+    def contribute_to_class(self, cls, name):
+        super(SharedMethods, self).contribute_to_class(cls, name)
+        # Add methods for many-to-one related objects.
+        # EXAMPLES: Choice.get_poll(), Story.get_dateline()
+        setattr(cls, 'get_%s' % self.name, curry(cls._get_foreign_key_object, field_with_rel=self))
-
-class ForeignKey(SharedMethods,Field):
@@ -258 +263 @@
-        return new_data
-
+    def contribute_to_class(self, cls, name):
+        super(ManyToManyField, self).contribute_to_class(cls, name)
+        # Add "get_thingie" methods for many-to-many related objects.
+        # EXAMPLES: Poll.get_site_list(), Story.get_byline_list()
+        setattr(cls, 'get_%s_list' % self.rel.singular, curry(cls._get_many_to_many_objects, field_with_rel=self))
+
+        # Add "set_thingie" methods for many-to-many related objects.
+        # EXAMPLES: Poll.set_sites(), Story.set_bylines()
+        setattr(cls, 'set_%s' % self.name, curry(cls._set_many_to_many_objects, field_with_rel=self))
+
-    def contribute_to_related_class(self, cls, related):
-        rel_obj_name = related.get_method_name_part()