From d94de802d34c858805a01d3c699799aebc247ec3 Mon Sep 17 00:00:00 2001 From: mlavin Date: Sun, 20 Apr 2014 08:58:29 -0400 Subject: [1.7.x] Fixed #22477 -- Removed contrib middleware from the global settings defaults. Also added a compatibility check for changed middleware defaults. --- tests/admin_scripts/tests.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/admin_scripts/tests.py') diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py index 7eedf18a4d..00498e122f 100644 --- a/tests/admin_scripts/tests.py +++ b/tests/admin_scripts/tests.py @@ -58,11 +58,12 @@ class AdminScriptTestCase(unittest.TestCase): 'ROOT_URLCONF', 'SECRET_KEY', 'TEST_RUNNER', # We need to include TEST_RUNNER, otherwise we get a compatibility warning. + 'MIDDLEWARE_CLASSES', # We need to include MIDDLEWARE_CLASSES, otherwise we get a compatibility warning. ] for s in exports: if hasattr(settings, s): o = getattr(settings, s) - if not isinstance(o, dict): + if not isinstance(o, (dict, tuple, list)): o = "'%s'" % o settings_file.write("%s = %s\n" % (s, o)) -- cgit v1.3