MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2809 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 49 insertions, 0 deletions

diff --git a/django/contrib/contenttypes/models.py b/django/contrib/contenttypes/models.py
new file mode 100644
index 0000000000..eb6029e7d4
--- /dev/null
+++ b/django/contrib/contenttypes/models.py
@@ -0,0 +1,49 @@
+from django.db import models
+from django.utils.translation import gettext_lazy as _
+
+class ContentTypeManager(models.Manager):
+    def get_for_model(self, model):
+        """
+        Returns the ContentType object for the given model, creating the
+        ContentType if necessary.
+        """
+        opts = model._meta
+        try:
+            return self.model._default_manager.get(app_label=opts.app_label,
+                model=opts.object_name.lower())
+        except self.model.DoesNotExist:
+            # The str() is needed around opts.verbose_name because it's a
+            # django.utils.functional.__proxy__ object.
+            ct = self.model(name=str(opts.verbose_name),
+                app_label=opts.app_label, model=opts.object_name.lower())
+            ct.save()
+            return ct
+
+class ContentType(models.Model):
+    name = models.CharField(maxlength=100)
+    app_label = models.CharField(maxlength=100)
+    model = models.CharField(_('python model class name'), maxlength=100)
+    objects = ContentTypeManager()
+    class Meta:
+        verbose_name = _('content type')
+        verbose_name_plural = _('content types')
+        db_table = 'django_content_type'
+        ordering = ('name',)
+        unique_together = (('app_label', 'model'),)
+
+    def __repr__(self):
+        return self.name
+
+    def model_class(self):
+        "Returns the Python model class for this type of content."
+        from django.db import models
+        return models.get_model(self.app_label, self.model)
+
+    def get_object_for_this_type(self, **kwargs):
+        """
+        Returns an object of this type for the keyword arguments given.
+        Basically, this is a proxy around this object_type's get_object() model
+        method. The ObjectNotExist exception, if thrown, will not be caught,
+        so code that calls this method should catch it.
+        """
+        return self.model_class()._default_manager.get(**kwargs)