Ticket #15610: django-1.6.5-15610.patch

django/contrib/contenttypes/generic.py

@@ -65 +65 @@
 
     def get_content_type(self, obj=None, id=None, using=None):
         if obj is not None:
-            return ContentType.objects.db_manager(obj._state.db).get_for_model(
+            return ContentType.objects.db_manager(
+                ContentType.objects.db).get_for_model(
                 obj, for_concrete_model=self.for_concrete_model)
         elif id:
             return ContentType.objects.db_manager(using).get_for_id(id)

django/contrib/contenttypes/models.py

@@ -1 +1 @@
 from django.db import models
+from django.db import router, DEFAULT_DB_ALIAS
 from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import smart_text, force_text
 from django.utils.encoding import python_2_unicode_compatible
@@ -165 +166 @@
         method. The ObjectNotExist exception, if thrown, will not be caught,
         so code that calls this method should catch it.
         """
-        return self.model_class()._base_manager.using(self._state.db).get(**kwargs)
+        return self.model_class()._base_manager.using(
+            router.db_for_read(self.model_class()) or DEFAULT_DB_ALIAS
+        ).get(**kwargs)
 
     def get_all_objects_for_this_type(self, **kwargs):
         """
         Returns all objects of this type for the keyword arguments given.
         """
-        return self.model_class()._base_manager.using(self._state.db).filter(**kwargs)
+        return self.model_class()._base_manager.using(
+            router.db_for_read(self.model_class()) or DEFAULT_DB_ALIAS
+        ).filter(**kwargs)
 
     def natural_key(self):
         return (self.app_label, self.model)