diff options
| -rw-r--r-- | django/db/models/base.py | 6 | ||||
| -rwxr-xr-x | tests/runtests.py | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/django/db/models/base.py b/django/db/models/base.py index 7655f35160..e1a94d34d1 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 f9c06b0a9c..e5f2bdedbf 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -76,8 +76,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', |