Commit 9b22badd authored by Andrew Godwin's avatar Andrew Godwin
Browse files

Merge pull request #1130 from vdboor/issue_20442_get_for_id 

Fixed #20442: NoneType error when fetching a stale ContentType with get_for_id
parents c6855e8a 86e761fe

django/contrib/contenttypes/models.py

+4 −2
Original line number Diff line number Diff line
@@ -118,11 +118,13 @@ class ContentTypeManager(models.Manager): 


    def _add_to_cache(self, using, ct):

        """Insert a ContentType into the cache."""

        model = ct.model_class()

        key = (model._meta.app_label, model._meta.model_name)

        # Note it's possible for ContentType objects to be stale; model_class() will return None.

        # Hence, there is no reliance on model._meta.app_label here, just using the model fields instead.

        key = (ct.app_label, ct.model)

        self.__class__._cache.setdefault(using, {})[key] = ct

        self.__class__._cache.setdefault(using, {})[ct.id] = ct





@python_2_unicode_compatible

class ContentType(models.Model):

    name = models.CharField(max_length=100)

django/contrib/contenttypes/tests.py

+7 −0
Original line number Diff line number Diff line
@@ -274,3 +274,10 @@ class ContentTypesTests(TestCase): 
            model = 'OldModel',

        )

        self.assertEqual(six.text_type(ct), 'Old model')

        self.assertIsNone(ct.model_class())



        # Make sure stale ContentTypes can be fetched like any other object.

        # Before Django 1.6 this caused a NoneType error in the caching mechanism.

        # Instead, just return the ContentType object and let the app detect stale states.

        ct_fetched = ContentType.objects.get_for_id(ct.pk)

        self.assertIsNone(ct_fetched.model_class())