Commit a4b11826 authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Tightened up code in... 

Tightened up code in django.contrib.contenttypes.models.ContentTypeManager.get_for_model() to use get_or_create()

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

django/contrib/contenttypes/models.py

+5 −10
Original line number Diff line number Diff line
@@ -8,15 +8,10 @@ class ContentTypeManager(models.Manager): 
        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()

        ct, created = self.model._default_manager.get_or_create(app_label=opts.app_label,

            model=opts.object_name.lower(), defaults={'name': str(opts.verbose_name)})

        return ct



class ContentType(models.Model):