Ticket #1280: contenttypes.diff

django/contrib/contenttypes/models.py

@@ -1 +1 @@
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-
-class Package(models.Model):
-    label = models.CharField(_('label'), maxlength=20, primary_key=True)
-    name = models.CharField(_('name'), maxlength=30, unique=True)
-    class Meta:
-        verbose_name = _('package')
-        verbose_name_plural = _('packages')
-        db_table = 'django_package'
-        ordering = ('name',)
-
-    def __repr__(self):
-        return self.name
-
-class ContentType(models.Model):
-    name = models.CharField(_('name'), maxlength=100)
-package = models.ForeignKey(Package, db_column='package'
-
+model = models.CharField(_('python model class name'), maxlength=100, primary_key=True
+
-    class Meta:
-        verbose_name = _('content type')
-        verbose_name_plural = _('content types')
-        db_table = 'django_content_type'
-
-
+
-
-    def __repr__(self):
-"%s | %s" % (self.package_id, self.name)
+self.name
-
-
-
-
+
+
+
+
+
+
-
-    def get_object_for_this_type(self, **kwargs):
-        """
@@ -38 +28 @@
-        method. The ObjectNotExist exception, if thrown, will not be caught,
-        so code that calls this method should catch it.
-        """
-module().get_objec
+class().objects.ge

django/contrib/auth/models.py

@@ -1 +1 @@
-from django.core import validators
-from django.db import backend, connection, models
-Packag
+ContentTyp
-from django.utils.translation import gettext_lazy as _
-import datetime
-
@@ -11 +11 @@
-
-class Permission(models.Model):
-    name = models.CharField(_('name'), maxlength=50)
-package = models.ForeignKey(Package, db_column='packag
+content_type = models.ForeignKey(ContentType, db_column='content_typ
-    codename = models.CharField(_('codename'), maxlength=100)
-    class Meta:
-        verbose_name = _('Permission')
-        verbose_name_plural = _('Permissions')
-packag
-packag
+content_typ
+content_typ
-
-    def __repr__(self):
-package_id
+content_type
-
-class Group(models.Model):
-    name = models.CharField(_('name'), maxlength=80, unique=True)
@@ -133 +133 @@
-            cursor = connection.cursor()
-            # The SQL below works out to the following, after DB quoting:
-            # cursor.execute("""
-packag
+content_typ
-            #     FROM auth_permission p, auth_group_permissions gp, auth_user_groups ug
-            #     WHERE p.id = gp.permission_id
-            #         AND gp.group_id = ug.group_id
@@ -144 +144 @@
-                WHERE p.%s = gp.%s
-                    AND gp.%s = ug.%s
-                    AND ug.%s = %%s""" % (
-packag
+content_typ
-                backend.quote_name('auth_permission'), backend.quote_name('auth_group_permissions'),
-                backend.quote_name('auth_user_groups'), backend.quote_name('id'),
-                backend.quote_name('permission_id'), backend.quote_name('group_id'),
@@ -156 +156 @@
-    def get_all_permissions(self):
-        if not hasattr(self, '_perm_cache'):
-            import sets
-package_id
+content_type
-            self._perm_cache.update(self.get_group_permissions())
-        return self._perm_cache
-
@@ -175 +175 @@
-                return False
-        return True
-
-
-
+
+
+
-        if self.is_superuser:
-            return True
-package
+model
-
-    def get_and_delete_messages(self):
-        messages = []

django/core/management.py

@@ -26 +26 @@
-
-INVALID_PROJECT_NAMES = ('django', 'test')
-
-def _get_packages_insert(app_label):
-    from django.db import backend
-    return "INSERT INTO %s (%s, %s) VALUES ('%s', '%s');" % \
-        (backend.quote_name('django_package'), backend.quote_name('label'), backend.quote_name('name'),
-        app_label, app_label)
-
-def _get_permission_codename(action, opts):
-    return '%s_%s' % (action, opts.object_name.lower())
-
@@ -43 +37 @@
-            perms.append((_get_permission_codename(action, opts), 'Can %s %s' % (action, opts.verbose_name)))
-    return perms + list(opts.permissions)
-
-opt
+klas
-    from django.db import backend
-    return "INSERT INTO %s (%s, %s, %s) VALUES ('%s', '%s', '%s');" % \
-packag
-opts.app_label
+content_typ
+klass.__module__+'.'+klass.__name__
-
-opt
+klas
-    from django.db import backend
-, %s) VALUES ('%s', 
-package
-backend.quote_name('python_module_name'), opts.verbose_name, opts.app_label, opts.module_name
+) VALUES (
+model
+klass._meta.object_name, klass.__module__+'.'+klass.__name__
-
-def _is_valid_dir_name(s):
-    return bool(re.search(r'^\w+$', s))
@@ -290 +284 @@
-
-    app_models = get_models(app)
-    app_label = app_models[0]._meta.app_label
-    output.append(_get_packages_insert(app_label))
-    app_dir = os.path.normpath(os.path.join(os.path.dirname(app.__file__), 'sql'))
-
-    for klass in app_models:
@@ -307 +300 @@
-                fp.close()
-
-        # Content types.
-opt
+klas
-        # Permissions.
-        for codename, name in _get_all_permissions(opts):
-opt
+klas
-    return output
-get_sql_initial_data.help_doc = "Prints the initial INSERT SQL statements for the given app name(s)."
-get_sql_initial_data.args = APP_ARGS

django/db/models/options.py

@@ -88 +88 @@
-        "Returns the content-type ID for this object type."
-        if not hasattr(self, '_content_type_id'):
-            from django.contrib.contenttypes.models import ContentType
-
-
-
+
-        return self._content_type_id
-
-    def get_field(self, name, many_to_many=True):

django/db/models/manipulators.py

@@ -185 +185 @@
-                        # Related links are a special case, because we have to
-                        # manually set the "content_type_id" and "object_id" fields.
-                        if self.opts.has_related_links and related.opts.module_name == 'relatedlinks':
-
-
+
-                            params['object_id'] = new_object.id
-
-                    # Create the related item.