[SCM] live-studio branch, master, updated. 541f1b2730aff7ac70fe20cc8be60d95fe44be44

[Chris Lamb]

The following commit has been merged in the master branch:
commit 1a58bcc6030226f5fb7bd782f14f956f0332716e
Author: Chris Lamb <lamby at debian.org>
Date:   Fri Jul 30 02:13:18 2010 -0400

    Add optional debug_toolbar support.

diff --git a/live_studio/settings/defaults/apps.py b/live_studio/settings/defaults/apps.py
index c10d0a2..db0e908 100644
--- a/live_studio/settings/defaults/apps.py
+++ b/live_studio/settings/defaults/apps.py
@@ -23,3 +23,10 @@ try:
     INSTALLED_APPS.append('django_extensions')
 except ImportError:
     pass
+
+try:
+    import debug_toolbar
+
+    INSTALLED_APPS.append('debug_toolbar')
+except ImportError:
+    pass
diff --git a/live_studio/settings/defaults/middleware.py b/live_studio/settings/defaults/middleware.py
index 357f820..7eefc49 100644
--- a/live_studio/settings/defaults/middleware.py
+++ b/live_studio/settings/defaults/middleware.py
@@ -1,4 +1,4 @@
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE_CLASSES = [
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
@@ -6,4 +6,13 @@ MIDDLEWARE_CLASSES = (
 
     'live_studio.auth.middleware.RequireLoginMiddleware',
     'django.middleware.transaction.TransactionMiddleware',
-)
+]
+
+try:
+    import debug_toolbar
+
+    MIDDLEWARE_CLASSES.append(
+        'debug_toolbar.middleware.DebugToolbarMiddleware',
+    )
+except ImportError:
+    pass
diff --git a/live_studio/settings/defaults/misc.py b/live_studio/settings/defaults/misc.py
index 1dd3ee9..ba2062a 100644
--- a/live_studio/settings/defaults/misc.py
+++ b/live_studio/settings/defaults/misc.py
@@ -61,3 +61,5 @@ ROOT_URLCONF = 'live_studio.urls'
 LOGIN_REDIRECT_URL = '/configs'
 
 ACCOUNT_ACTIVATION_DAYS = 7
+
+INTERNAL_IPS = ('127.0.0.1',)

-- 
live-studio