From 4f2769746773f0a796206f4fcf01f180bdaff640 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 27 Aug 2015 17:28:12 +0100
Subject: [PATCH] Fix get_model import

---
 rest_framework/compat.py           | 8 ++++++++
 rest_framework/utils/model_meta.py | 4 ++--
 tests/test_utils.py                | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index 164cf2003..607778a9e 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -82,6 +82,14 @@ except ImportError:
     postgres_fields = None
 
 
+# Apps only exists from 1.7 onwards.
+try:
+    from django.apps import apps
+    get_model = apps.get_model
+except ImportError:
+    from django.db.models import get_model
+
+
 # django-filter is optional
 try:
     import django_filters
diff --git a/rest_framework/utils/model_meta.py b/rest_framework/utils/model_meta.py
index 3bcd9049c..971864769 100644
--- a/rest_framework/utils/model_meta.py
+++ b/rest_framework/utils/model_meta.py
@@ -12,7 +12,7 @@ from django.core.exceptions import ImproperlyConfigured
 from django.db import models
 from django.utils import six
 
-from rest_framework.compat import OrderedDict
+from rest_framework.compat import OrderedDict, get_model
 
 FieldInfo = namedtuple('FieldResult', [
     'pk',  # Model field instance
@@ -45,7 +45,7 @@ def _resolve_model(obj):
     """
     if isinstance(obj, six.string_types) and len(obj.split('.')) == 2:
         app_name, model_name = obj.split('.')
-        resolved_model = models.get_model(app_name, model_name)
+        resolved_model = get_model(app_name, model_name)
         if resolved_model is None:
             msg = "Django did not return a model for {0}.{1}"
             raise ImproperlyConfigured(msg.format(app_name, model_name))
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 062f78e11..4c9fd03c8 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -150,12 +150,12 @@ class ResolveModelWithPatchedDjangoTests(TestCase):
 
     def setUp(self):
         """Monkeypatch get_model."""
-        self.get_model = rest_framework.utils.model_meta.models.get_model
+        self.get_model = rest_framework.utils.model_meta.get_model
 
         def get_model(app_label, model_name):
             return None
 
-        rest_framework.utils.model_meta.models.get_model = get_model
+        rest_framework.utils.model_meta.get_model = get_model
 
     def tearDown(self):
         """Revert monkeypatching."""