From 34a215d5066f8ae0629070916714801b0ea03eab Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sun, 29 Dec 2013 21:47:55 +0100
Subject: Deprecated the app argument of apps.get_models.

Use app_config.get_models() instead.
---
 tests/app_loading/tests.py   |  3 ---
 tests/apps/tests.py          |  7 ++-----
 tests/defer_regress/tests.py | 36 ++++++++++--------------------------
 3 files changed, 12 insertions(+), 34 deletions(-)

(limited to 'tests')

diff --git a/tests/app_loading/tests.py b/tests/app_loading/tests.py
index 5219b5315d..46c5955c53 100644
--- a/tests/app_loading/tests.py
+++ b/tests/app_loading/tests.py
@@ -79,6 +79,3 @@ class GetModelsTest(TestCase):
         self.assertNotIn(
             "NotInstalledModel",
             [m.__name__ for m in apps.get_models()])
-
-    def test_get_models_with_app_label_only_returns_installed_models(self):
-        self.assertEqual(apps.get_models(self.not_installed_module), [])
diff --git a/tests/apps/tests.py b/tests/apps/tests.py
index 4cd35c38cf..a75ae94a75 100644
--- a/tests/apps/tests.py
+++ b/tests/apps/tests.py
@@ -159,7 +159,7 @@ class AppsTests(TestCase):
         """
         Makes a new model at runtime and ensures it goes into the right place.
         """
-        old_models = apps.get_models(apps.get_app_config("apps").models_module)
+        old_models = list(apps.get_app_config("apps").get_models())
         # Construct a new model in a new app registry
         body = {}
         new_apps = Apps()
@@ -172,10 +172,7 @@ class AppsTests(TestCase):
         body['__module__'] = TotallyNormal.__module__
         temp_model = type(str("SouthPonies"), (models.Model,), body)
         # Make sure it appeared in the right place!
-        self.assertEqual(
-            old_models,
-            apps.get_models(apps.get_app_config("apps").models_module),
-        )
+        self.assertListEqual(list(apps.get_app_config("apps").get_models()), old_models)
         with self.assertRaises(LookupError):
             apps.get_model("apps", "SouthPonies")
         self.assertEqual(new_apps.get_model("apps", "SouthPonies"), temp_model)
diff --git a/tests/defer_regress/tests.py b/tests/defer_regress/tests.py
index 22c2d281da..97d7e7e302 100644
--- a/tests/defer_regress/tests.py
+++ b/tests/defer_regress/tests.py
@@ -92,42 +92,26 @@ class DeferRegressionTest(TestCase):
             list)
 
     def test_ticket_11936(self):
-        # Regression for #11936 - loading.get_models should not return deferred
-        # models by default.
-        # Run a couple of defer queries so that app-cache must contain some
-        # deferred classes. It might contain a lot more classes depending on
-        # the order the tests are ran.
+        app_config = apps.get_app_config("defer_regress")
+        # Regression for #11936 - get_models should not return deferred models
+        # by default. Run a couple of defer queries so that app registry must
+        # contain some deferred classes. It might contain a lot more classes
+        # depending on the order the tests are ran.
         list(Item.objects.defer("name"))
         list(Child.objects.defer("value"))
-        klasses = set(
-            map(
-                attrgetter("__name__"),
-                apps.get_models(apps.get_app_config("defer_regress").models_module)
-            )
-        )
+        klasses = {model.__name__ for model in app_config.get_models()}
         self.assertIn("Child", klasses)
         self.assertIn("Item", klasses)
         self.assertNotIn("Child_Deferred_value", klasses)
         self.assertNotIn("Item_Deferred_name", klasses)
-        self.assertFalse(any(
-            k._deferred for k in apps.get_models(apps.get_app_config("defer_regress").models_module)))
-
-        klasses_with_deferred = set(
-            map(
-                attrgetter("__name__"),
-                apps.get_models(
-                    apps.get_app_config("defer_regress").models_module, include_deferred=True
-                ),
-            )
-        )
+        self.assertFalse(any(k._deferred for k in app_config.get_models()))
+
+        klasses_with_deferred = {model.__name__ for model in app_config.get_models(include_deferred=True)}
         self.assertIn("Child", klasses_with_deferred)
         self.assertIn("Item", klasses_with_deferred)
         self.assertIn("Child_Deferred_value", klasses_with_deferred)
         self.assertIn("Item_Deferred_name", klasses_with_deferred)
-        self.assertTrue(any(
-            k._deferred for k in apps.get_models(
-                apps.get_app_config("defer_regress").models_module, include_deferred=True))
-        )
+        self.assertTrue(any(k._deferred for k in app_config.get_models(include_deferred=True)))
 
     @override_settings(SESSION_SERIALIZER='django.contrib.sessions.serializers.PickleSerializer')
     def test_ticket_12163(self):
-- 
cgit v1.3