Raise PolymorphicTypeInvalid when model is None

Author: nlsfnr

polymorphic/models.py

@@ -157,17 +157,23 @@ def get_real_instance(self):
         retrieve objects, then the complete object with it's real class/type
         and all fields may be retrieved with this method.
 
-        If the model of the object's actual type does not exist (e.g. it was
-        removed but its ContentType still exists), this method returns self.
+        If the model of the object's actual type does not exist (i.e. its
+        ContentType is stale), this method raises a
+        :class:`~polymorphic.models.PolymorphicTypeInvalid` exception.
 
         .. note::
             Each method call executes one db query (if necessary).
             Use the :meth:`~polymorphic.managers.PolymorphicQuerySet.get_real_instances`
             to upcast a complete list in a single efficient query.
         """
         real_model = self.get_real_instance_class()
-        if real_model == self.__class__ or real_model is None:
+        if real_model == self.__class__:
             return self
+        if real_model is None:
+            raise PolymorphicTypeInvalid(
+                f"ContentType {self.polymorphic_ctype_id} for {self.__class__} "
+                f"#{self.pk} does not have a corresponding model!"
+            )
         return real_model.objects.db_manager(self._state.db).get(pk=self.pk)
 
     def __init__(self, *args, **kwargs):

polymorphic/tests/test_orm.py

@@ -321,12 +321,14 @@ def test_manual_get_real_instance(self):
         o = Model2A.objects.non_polymorphic().get(field1="C1")
         assert o.get_real_instance().__class__ == Model2C
 
-    def test_get_real_instance_with_no_model_class(self):
-        ctype = ContentType.objects.create(app_label="tests", model="nonexisting")
+    def test_get_real_instance_with_stale_content_type(self):
+        ctype = ContentType.objects.create(app_label="tests", model="stale")
         o = Model2A.objects.create(field1="A1", polymorphic_ctype=ctype)
 
         assert o.get_real_instance_class() is None
-        assert o.get_real_instance().__class__ == Model2A
+        match = "does not have a corresponding model"
+        with pytest.raises(PolymorphicTypeInvalid, match=match):
+            o.get_real_instance()
 
     def test_non_polymorphic(self):
         self.create_model2abcd()