summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVarun Sharma <varunsharmalive@gmail.com>2015-12-24 23:58:32 +0530
committerTim Graham <timograham@gmail.com>2015-12-24 16:44:58 -0500
commit692d05589061a593d4bfbdb2895eaef0386eca34 (patch)
tree64d741a03bb92f54313f3ebbef612429863c705e
parenta53175392ff753cc53a4a2d33a5852d113e67363 (diff)
Fixed #25984 -- Corrected RuntimeError message in ModelBase.__new__().
-rw-r--r--django/db/models/base.py6
-rwxr-xr-xtests/runtests.py3
2 files changed, 4 insertions, 5 deletions
diff --git a/django/db/models/base.py b/django/db/models/base.py
index 149b0e5a42..028367d584 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -98,9 +98,9 @@ class ModelBase(type):
if not abstract:
raise RuntimeError(
"Model class %s.%s doesn't declare an explicit "
- "app_label and either isn't in an application in "
- "INSTALLED_APPS or else was imported before its "
- "application was loaded. " % (module, name))
+ "app_label and isn't in an application in "
+ "INSTALLED_APPS." % (module, name)
+ )
else:
app_label = app_config.label
diff --git a/tests/runtests.py b/tests/runtests.py
index 7d7df4486a..ced896987b 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -73,8 +73,7 @@ ALWAYS_MIDDLEWARE_CLASSES = [
# Need to add the associated contrib app to INSTALLED_APPS in some cases to
# avoid "RuntimeError: Model class X doesn't declare an explicit app_label
-# and either isn't in an application in INSTALLED_APPS or else was imported
-# before its application was loaded."
+# and isn't in an application in INSTALLED_APPS."
CONTRIB_TESTS_TO_APPS = {
'flatpages_tests': 'django.contrib.flatpages',
'redirects_tests': 'django.contrib.redirects',