From e7b9a58b081299b30f807d5c66f7a5d1940efe4c Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Wed, 19 Nov 2014 15:56:04 -0700 Subject: [PATCH] Fixed #21794 -- Removed deprecation warning for abstract models outside an app. --- django/db/models/base.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/django/db/models/base.py b/django/db/models/base.py index 2b79a20cee..e4f970af05 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -100,13 +100,11 @@ class ModelBase(type): msg = ( "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. " % + "else was imported before its application was loaded. " + "This will no longer be supported in Django 1.9." % (module, name)) - if abstract: - msg += "Its app_label will be set to None in Django 1.9." - else: - msg += "This will no longer be supported in Django 1.9." - warnings.warn(msg, RemovedInDjango19Warning, stacklevel=2) + if not abstract: + warnings.warn(msg, RemovedInDjango19Warning, stacklevel=2) model_module = sys.modules[new_class.__module__] package_components = model_module.__name__.split('.')