diff options
| author | Marten Kenbeek <marten.knbk@gmail.com> | 2015-06-30 20:38:07 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-06-30 15:00:10 -0400 |
| commit | aabb58428beae0bd34f32e5d620a82486b670499 (patch) | |
| tree | 268d5fb65e59fde7c144397b108a2bd6082ee84e | |
| parent | 00a1d4d042a7afd139316982c9b57e87d26a894f (diff) | |
Refs #23621 -- Fixed warning message when reloading models.
| -rw-r--r-- | django/apps/registry.py | 2 | ||||
| -rw-r--r-- | tests/apps/tests.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/django/apps/registry.py b/django/apps/registry.py index 0602c4ff57..269787545d 100644 --- a/django/apps/registry.py +++ b/django/apps/registry.py @@ -208,7 +208,7 @@ class Apps(object): warnings.warn( "Model '%s.%s' was already registered. " "Reloading models is not advised as it can lead to inconsistencies, " - "most notably with related models." % (model_name, app_label), + "most notably with related models." % (app_label, model_name), RuntimeWarning, stacklevel=2) else: raise RuntimeError( diff --git a/tests/apps/tests.py b/tests/apps/tests.py index c199fa156d..3dfd88f136 100644 --- a/tests/apps/tests.py +++ b/tests/apps/tests.py @@ -237,7 +237,7 @@ class AppsTests(SimpleTestCase): self.assertEqual(len(w), 1) self.assertTrue(issubclass(w[-1].category, RuntimeWarning)) self.assertEqual(str(w[-1].message), - "Model 'southponies.apps' was already registered. " + "Model 'apps.southponies' was already registered. " "Reloading models is not advised as it can lead to inconsistencies, " "most notably with related models.") |