From d334f46b7a080fd3eb720141c19b37b10704a352 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Sat, 31 Dec 2016 13:24:00 -0500 Subject: Refs #26601 -- Removed support for old-style middleware using settings.MIDDLEWARE_CLASSES. --- django/core/checks/compatibility/django_1_10.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'django/core/checks/compatibility') diff --git a/django/core/checks/compatibility/django_1_10.py b/django/core/checks/compatibility/django_1_10.py index 0ab28df6f8..120ef0b5b1 100644 --- a/django/core/checks/compatibility/django_1_10.py +++ b/django/core/checks/compatibility/django_1_10.py @@ -1,13 +1,13 @@ from __future__ import unicode_literals -from django.conf import global_settings, settings +from django.conf import settings from .. import Tags, Warning, register @register(Tags.compatibility) def check_duplicate_middleware_settings(app_configs, **kwargs): - if settings.MIDDLEWARE is not None and settings.MIDDLEWARE_CLASSES != global_settings.MIDDLEWARE_CLASSES: + if settings.MIDDLEWARE is not None and hasattr(settings, 'MIDDLEWARE_CLASSES'): return [Warning( "The MIDDLEWARE_CLASSES setting is deprecated in Django 1.10 " "and the MIDDLEWARE setting takes precedence. Since you've set " -- cgit v1.3