Ticket #8270: contenttype-label.diff

django/contrib/contenttypes/models.py

@@ -8 +8 @@
     # This cache is shared by all the get_for_* methods.
     _cache = {}
     
+    def get_for_app_label_and_model_name(self, app_label, model_name):
+        key = (app_label.lower(), model_name.lower())
+        try:
+            return self.__class__._cache[key]
+        except KeyError:
+            try:
+                ct = self.get(app_label=app_label,
+                        model=model_name)
+            except models.ObjectDoesNotExist:
+                ct = self.get_for_model(models.get_model(app_label, model_name))
+        self._add_to_cache(ct)                
+        return ct
+
     def get_for_model(self, model):
         """
         Returns the ContentType object for a given model, creating the