Fixed #1717: ContentType.objects.get_for_manager() is now cached for a small performance gain when dealing with content-types regularly. Thanks, Dave St.Germain.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
73d62743e9
commit
b118b28bac
|
@ -1,6 +1,7 @@
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
|
CONTENT_TYPE_CACHE = {}
|
||||||
class ContentTypeManager(models.Manager):
|
class ContentTypeManager(models.Manager):
|
||||||
def get_for_model(self, model):
|
def get_for_model(self, model):
|
||||||
"""
|
"""
|
||||||
|
@ -8,10 +9,15 @@ class ContentTypeManager(models.Manager):
|
||||||
ContentType if necessary.
|
ContentType if necessary.
|
||||||
"""
|
"""
|
||||||
opts = model._meta
|
opts = model._meta
|
||||||
|
key = (opts.app_label, opts.object_name.lower())
|
||||||
|
try:
|
||||||
|
ct = CONTENT_TYPE_CACHE[key]
|
||||||
|
except KeyError:
|
||||||
# The str() is needed around opts.verbose_name because it's a
|
# The str() is needed around opts.verbose_name because it's a
|
||||||
# django.utils.functional.__proxy__ object.
|
# django.utils.functional.__proxy__ object.
|
||||||
ct, created = self.model._default_manager.get_or_create(app_label=opts.app_label,
|
ct, created = self.model._default_manager.get_or_create(app_label=key[0],
|
||||||
model=opts.object_name.lower(), defaults={'name': str(opts.verbose_name)})
|
model=key[1], defaults={'name': str(opts.verbose_name)})
|
||||||
|
CONTENT_TYPE_CACHE[key] = ct
|
||||||
return ct
|
return ct
|
||||||
|
|
||||||
class ContentType(models.Model):
|
class ContentType(models.Model):
|
||||||
|
|
Loading…
Reference in New Issue