Changeset 1712

Timestamp:

12/16/05 17:34:44 (3 years ago)

Author:

adrian

Message:

magic-removal: Negligible change to 'set' import

Files:

• django/branches/magic-removal/django/core/management.py (modified) (1 diff)
• django/branches/magic-removal/django/db/models/base.py (modified) (16 diffs)

django/branches/magic-removal/django/core/management.py

@@ -7 +7 @@
-from optparse import OptionParser
-
-HACK: for Python2.3 
-
+ For Python 2.3
+ 
-    from sets import Set as set
-

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

@@ -4 +4 @@
-from django.db.models.related import RelatedObject
-from django.db.models.manager import Manager, ManagerDescriptor
- 
+
-from django.db.models.options import Options
-from django.db import connection, backend
@@ -15 +15 @@
-import sys
-
-HACK: for Python2.3 
-
+ For Python 2.3
+ 
-    from sets import Set as set
-
@@ -42 +42 @@
-        # Create the class, because we need it to use in currying.
-        new_class = type.__new__(cls, name, bases, { '__module__' : attrs.pop('__module__') })
-
+
-        opts = Options(
-            module_name = meta_attrs.pop('module_name', get_module_name(name)),
@@ -66 +66 @@
-            raise TypeError, "'class META' got invalid attribute(s): %s" % ','.join(meta_attrs.keys())
-        new_class.add_to_class('_meta', opts)
-
+
-        # Create the DoesNotExist exception.
-        new_class.DoesNotExist = types.ClassType('DoesNotExist', (ObjectDoesNotExist,), {})
-
+
-        # Figure out the app_label by looking one level up.
-        #FIXME: wrong for nested model modules
@@ -78 +78 @@
-        # Cache the app label.
-        opts.app_label = app_label
-
+
-        #Add all attributes to the class
-        #fields, managers = [], []
-        for obj_name, obj in attrs.items():
-            new_class.add_to_class(obj_name, obj)
-
+
-        if not hasattr(new_class, '_default_manager'):
-            # Create the default manager, if needed.
@@ -89 +89 @@
-                raise ValueError, "Model %s must specify a custom Manager, because it has a field named 'objects'" % name
-            new_class.add_to_class('objects',  Manager())
-
+
-        # Give the class a docstring -- its definition.
-        if new_class.__doc__ is None:
@@ -96 +96 @@
-        if hasattr(new_class, 'get_absolute_url'):
-            new_class.get_absolute_url = curry(get_absolute_url, opts, new_class.get_absolute_url)
-
+
-        opts._prepare()
-        new_class._prepare()
-
+
-        # If the db_table wasn't provided, use the app_label + module_name.
-        if not opts.db_table:
-            opts.db_table = "%s_%s" % (app_label, opts.module_name)
-
+
-        # Populate the _MODELS member on the module the class is in.
-        app_package.__dict__.setdefault('_MODELS', []).append(new_class)
-
-
+
+
-        return new_class
-
+
-def cmp_cls(x, y):
-    for field in x._meta.fields:
@@ -121 +121 @@
-class Model(object):
-    __metaclass__ = ModelBase
-
+
-    def add_to_class(cls, name, attribute):
-        if hasattr(attribute, 'contribute_to_class'):
@@ -128 +128 @@
-            setattr(cls, name, attribute)
-    add_to_class = classmethod(add_to_class)
-
+
-    AddManipulator = ManipulatorDescriptor('AddManipulator', ModelAddManipulator)
-    
-
+
+
-    def __repr__(self):
-        return '<%s object>' % self.__class__.__name__
@@ -215 +215 @@
-            cls.get_next_in_order = curry(cls.__get_next_or_previous_in_order, is_next=True)
-            cls.get_previous_in_order = curry(cls.__get_next_or_previous_in_order, is_next=False)
-
+
-        RelatedField.do_pending_lookups(cls)
-
@@ -278 +278 @@
-    def __collect_sub_objects(self, seen_objs, ignore_objs):
-        pk_val = self.__get_pk_val()
-
-        
-
+
+
+
-        if key in seen_objs or key in ignore_objs:
-            return
-        seen_objs[key] = self
-
+
-        for related in self._meta.get_all_related_objects():
-            rel_opts_name = related.get_method_name_part()
@@ -302 +302 @@
-        ignore_objects = \
-            ignore_objects and dict([ (o.__class,o.__get_pk_val) for o in ignore_objects ]) or {}
-
+
-        seen_objs = {}
-        self.__collect_sub_objects(seen_objs, ignore_objects)
-
+
-        seen_cls = set([cls for cls,pk in seen_objs.keys()])
-        cls_order = list(seen_cls)
@@ -312 +312 @@
-        seen_tups = [ (cls, pk_val, instance) for (cls, pk_val),instance in seen_objs.items() ]
-        seen_tups.sort(lambda x,y: cmp(cls_order.index(x[0]), cls_order.index(y[0])))
-
+
-        cursor = connection.cursor()
-
+
-        for cls, pk_val, instance in seen_tups:
-
+
-            # Run any pre-delete hooks.
-            if hasattr(instance, '_pre_delete'):
-                instance._pre_delete()
-
+
-            for related in cls._meta.get_all_related_many_to_many_objects():
-                cursor.execute("DELETE FROM %s WHERE %s=%%s" % \
@@ -331 +331 @@
-                    backend.quote_name(cls._meta.object_name.lower() + '_id')),
-                    [pk_val])
-
+
-            for field in cls._meta.fields:
-                if field.rel and field.null and field.rel.to in seen_cls:
-                    cursor.execute("UPDATE %s SET %s = NULL WHERE %s =%%s" % \
- 
+
-                                     backend.quote_name(field.column),
-                                     backend.quote_name(cls._meta.pk.column)),
-                                   [pk_val] )
-
+
-        seen_tups.reverse()
-
+
-        for cls, pk_val, instance in seen_tups:
-            cursor.execute("DELETE FROM %s WHERE %s=%%s" % \
-                (backend.quote_name(cls._meta.db_table), backend.quote_name(cls._meta.pk.column)),
-                [pk_val])
-
-
+
-            setattr(self, cls._meta.pk.attname, None)
-            for f in cls._meta.fields:
@@ -359 +358 @@
-            if hasattr(instance, '_post_delete'):
-                instance._post_delete()
-
+
-        connection.commit()
-
-    delete.alters_data = True
-
-
+
-    def __get_FIELD_display(self, field):
-        value = getattr(self, field.attname)
@@ -573 +572 @@
-
-
-
+
-
-