From f5769e44161a2e9dfa9acbd68287238f9caa95a6 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Wed, 7 Apr 2010 07:51:27 -0700
Subject: Revert "Factor settings data out of SettingsVarsDebugPanel."

This reverts commit 7e8a4e195d4b0e3cabf0742b31e087a81712d12f.
---
 debug_toolbar/debug/settings_vars.py  | 10 ----------
 debug_toolbar/panels/settings_vars.py | 12 +++++-------
 2 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 debug_toolbar/debug/settings_vars.py

(limited to 'debug_toolbar')

diff --git a/debug_toolbar/debug/settings_vars.py b/debug_toolbar/debug/settings_vars.py
deleted file mode 100644
index 4b4b2a7..0000000
--- a/debug_toolbar/debug/settings_vars.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from django.conf import settings
-from django.views.debug import get_safe_settings
-
-class DebugSettings(object):
-
-    def module_name(self):
-        return settings.SETTINGS_MODULE
-
-    def available_settings(self):
-        return get_safe_settings()
diff --git a/debug_toolbar/panels/settings_vars.py b/debug_toolbar/panels/settings_vars.py
index 69a9526..ebb4464 100644
--- a/debug_toolbar/panels/settings_vars.py
+++ b/debug_toolbar/panels/settings_vars.py
@@ -1,7 +1,9 @@
+from django.conf import settings
 from django.template.loader import render_to_string
+from django.views.debug import get_safe_settings
 from django.utils.translation import ugettext_lazy as _
 from debug_toolbar.panels import DebugPanel
-from debug_toolbar.debug.settings_vars import DebugSettings
+
 
 class SettingsVarsDebugPanel(DebugPanel):
     """
@@ -10,15 +12,11 @@ class SettingsVarsDebugPanel(DebugPanel):
     name = 'SettingsVars'
     has_content = True
 
-    def __init__(self, context={}):
-        super(SettingsVarsDebugPanel, self).__init__(context)
-        self.settings = DebugSettings()
-
     def nav_title(self):
         return _('Settings')
 
     def title(self):
-        return _('Settings from <code>%s</code>') % self.settings.module_name()
+        return _('Settings from <code>%s</code>') % settings.SETTINGS_MODULE
 
     def url(self):
         return ''
@@ -26,6 +24,6 @@ class SettingsVarsDebugPanel(DebugPanel):
     def content(self):
         context = self.context.copy()
         context.update({
-            'settings': self.settings.available_settings(),
+            'settings': get_safe_settings(),
         })
         return render_to_string('debug_toolbar/panels/settings_vars.html', context)
-- 
cgit v1.2.3