diff options
| author | mlavin <markdlavin@gmail.com> | 2014-04-20 08:58:29 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-06-13 12:40:42 -0400 |
| commit | d94de802d34c858805a01d3c699799aebc247ec3 (patch) | |
| tree | e6a99c7b37a052a9ebb6820f59f251357a573c72 /tests/admin_scripts | |
| parent | d3bf537324c1164dee45070f90d48661b27a781f (diff) | |
[1.7.x] Fixed #22477 -- Removed contrib middleware from the global settings defaults.
Also added a compatibility check for changed middleware defaults.
Diffstat (limited to 'tests/admin_scripts')
| -rw-r--r-- | tests/admin_scripts/tests.py | 3 |
1 files changed, 2 insertions, 1 deletions
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)) |
