From 1a5108a23d97f2c6d111afaff433df64c2211955 Mon Sep 17 00:00:00 2001
From: tschilling
Date: Fri, 14 Feb 2014 13:56:50 -0500
Subject: Deprecating INTERCEPT_REDIRECTS in favor of DEFAULT_DISABLED_PANELS.

---
 debug_toolbar/settings.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'debug_toolbar/settings.py')

diff --git a/debug_toolbar/settings.py b/debug_toolbar/settings.py
index 48649fd..2d02aa5 100644
--- a/debug_toolbar/settings.py
+++ b/debug_toolbar/settings.py
@@ -16,6 +16,7 @@ from django.utils import six
 
 CONFIG_DEFAULTS = {
     # Toolbar options
+    'DEFAULT_DISABLED_PANELS': ('RedirectsPanel', ),
     'INSERT_BEFORE': '</body>',
     'RENDER_PANELS': None,
     'RESULTS_STORE_SIZE': 10,
@@ -32,7 +33,6 @@ CONFIG_DEFAULTS = {
         'debug_toolbar',
         'django',
     ),
-    'INTERCEPT_REDIRECTS': False,
     'SHOW_TEMPLATE_CONTEXT': True,
     'SQL_WARNING_THRESHOLD': 500,   # milliseconds
 }
@@ -125,6 +125,23 @@ else:
             PANELS[index] = new_panel
 
 
+if 'INTERCEPT_REDIRECTS' in USER_CONFIG:
+    warnings.warn(
+        "INTERCEPT_REDIRECTS is deprecated. Please use the "
+        "DEFAULT_DISABLED_PANELS config in the"
+        "DEBUG_TOOLBAR_CONFIG setting.", DeprecationWarning)
+    if USER_CONFIG['INTERCEPT_REDIRECTS']:
+        if 'RedirectsPanel' in CONFIG['DEFAULT_DISABLED_PANELS']:
+            # RedirectsPanel should be enabled
+            CONFIG['DEFAULT_DISABLED_PANELS'] = [
+                panel for panel in CONFIG['DEFAULT_DISABLED_PANELS']
+                if panel != "RedirectsPanel"
+            ]
+    elif not 'RedirectsPanel' in CONFIG['DEFAULT_DISABLED_PANELS']:
+        # RedirectsPanel should be disabled
+        CONFIG['DEFAULT_DISABLED_PANELS'].append('RedirectsPanel')
+
+
 PATCH_SETTINGS = getattr(settings, 'DEBUG_TOOLBAR_PATCH_SETTINGS', settings.DEBUG)
 
 
-- 
cgit v1.2.3


From cc08c0d19bd5d1c7ff2281e3c3e4d92fa932e6d5 Mon Sep 17 00:00:00 2001
From: tschilling
Date: Sat, 15 Feb 2014 08:59:20 -0500
Subject: Changing the collection to be fully qualified names and for it to be
 a set not a tuple.

---
 debug_toolbar/settings.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'debug_toolbar/settings.py')

diff --git a/debug_toolbar/settings.py b/debug_toolbar/settings.py
index 2d02aa5..0ea75ab 100644
--- a/debug_toolbar/settings.py
+++ b/debug_toolbar/settings.py
@@ -16,7 +16,7 @@ from django.utils import six
 
 CONFIG_DEFAULTS = {
     # Toolbar options
-    'DEFAULT_DISABLED_PANELS': ('RedirectsPanel', ),
+    'DEFAULT_DISABLED_PANELS': {'debug_toolbar.panels.redirects.RedirectsPanel'},
     'INSERT_BEFORE': '</body>',
     'RENDER_PANELS': None,
     'RESULTS_STORE_SIZE': 10,
@@ -131,15 +131,22 @@ if 'INTERCEPT_REDIRECTS' in USER_CONFIG:
         "DEFAULT_DISABLED_PANELS config in the"
         "DEBUG_TOOLBAR_CONFIG setting.", DeprecationWarning)
     if USER_CONFIG['INTERCEPT_REDIRECTS']:
-        if 'RedirectsPanel' in CONFIG['DEFAULT_DISABLED_PANELS']:
+        if 'debug_toolbar.panels.redirects.RedirectsPanel' \
+                in CONFIG['DEFAULT_DISABLED_PANELS']:
             # RedirectsPanel should be enabled
-            CONFIG['DEFAULT_DISABLED_PANELS'] = [
-                panel for panel in CONFIG['DEFAULT_DISABLED_PANELS']
-                if panel != "RedirectsPanel"
-            ]
-    elif not 'RedirectsPanel' in CONFIG['DEFAULT_DISABLED_PANELS']:
+            try:
+                CONFIG['DEFAULT_DISABLED_PANELS'].remove(
+                    'debug_toolbar.panels.redirects.RedirectsPanel'
+                )
+            except KeyError:
+                # We wanted to remove it, but it didn't exist. This is fine
+                pass
+    elif not 'debug_toolbar.panels.redirects.RedirectsPanel' \
+            in CONFIG['DEFAULT_DISABLED_PANELS']:
         # RedirectsPanel should be disabled
-        CONFIG['DEFAULT_DISABLED_PANELS'].append('RedirectsPanel')
+        CONFIG['DEFAULT_DISABLED_PANELS'].add(
+            'debug_toolbar.panels.redirects.RedirectsPanel'
+        )
 
 
 PATCH_SETTINGS = getattr(settings, 'DEBUG_TOOLBAR_PATCH_SETTINGS', settings.DEBUG)
-- 
cgit v1.2.3


From 5fd65ef273ff011c156b8a6953b667f8b6b6c249 Mon Sep 17 00:00:00 2001
From: tschilling
Date: Sat, 15 Feb 2014 09:07:31 -0500
Subject: Changing set declaration.

---
 debug_toolbar/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'debug_toolbar/settings.py')

diff --git a/debug_toolbar/settings.py b/debug_toolbar/settings.py
index 0ea75ab..2c71888 100644
--- a/debug_toolbar/settings.py
+++ b/debug_toolbar/settings.py
@@ -16,7 +16,7 @@ from django.utils import six
 
 CONFIG_DEFAULTS = {
     # Toolbar options
-    'DEFAULT_DISABLED_PANELS': {'debug_toolbar.panels.redirects.RedirectsPanel'},
+    'DEFAULT_DISABLED_PANELS': set(['debug_toolbar.panels.redirects.RedirectsPanel']),
     'INSERT_BEFORE': '</body>',
     'RENDER_PANELS': None,
     'RESULTS_STORE_SIZE': 10,
-- 
cgit v1.2.3