From cc333d94308d3c7a87bcf2bdfe544bfc21a5b1c1 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Thu, 15 Dec 2016 13:17:07 +0000
Subject: [PATCH] Changed method of retrieving an app's models.  Also now
 importing import_module from importlib instead of from django.  - Legacy-Id:
 12531

---
 ietf/api/__init__.py | 2 +-
 ietf/api/tests.py    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ietf/api/__init__.py b/ietf/api/__init__.py
index fa2601177..78b91f6a6 100644
--- a/ietf/api/__init__.py
+++ b/ietf/api/__init__.py
@@ -133,8 +133,8 @@ def autodiscover():
     may want.
     """
 
+    from importlib import import_module
     from django.conf import settings
-    from django.utils.importlib import import_module
     from django.utils.module_loading import module_has_submodule
 
     for app in settings.INSTALLED_APPS:
diff --git a/ietf/api/tests.py b/ietf/api/tests.py
index 41829d678..0d0d28208 100644
--- a/ietf/api/tests.py
+++ b/ietf/api/tests.py
@@ -1,11 +1,11 @@
 import os
 import sys
 import json
+from importlib import import_module
 
+from django.apps import apps
 from django.test import Client
 from django.conf import settings
-from django.utils.importlib import import_module
-from django.db import models
 
 from tastypie.exceptions import BadRequest
 from tastypie.test import ResourceTestCaseMixin
@@ -82,7 +82,8 @@ class TastypieApiTestCase(ResourceTestCaseMixin, TestCase):
             self.assertValidJSONResponse(r)
             app_resources = json.loads(r.content)
             self._assertCallbackReturnsSameJSON("/api/v1/%s/"%name, app_resources)
-            model_list = models.get_models(app.models)
+            #
+            model_list = apps.get_app_config(name).get_models()
             for model in model_list:
                 if not model._meta.model_name in app_resources.keys():
                     #print("There doesn't seem to be any resource for model %s.models.%s"%(app.__name__,model.__name__,))