launchpad-reviewers team mailing list archive

[Raphaël Badin <raphael.badin@xxxxxxxxxxxxx>]

Raphaël Badin has proposed merging lp:~rvb/maas/maas-fix-demo into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/maas-fix-demo/+merge/95916

This branch cleans up the settings file demo.py and development.py.

- The debug toolbar and the api error middleware need to be present only in the demo settings (leaving them in development means the api error middleware logs all kind of stuff when tests are run, which is less than ideal)
- No need to override the default (from settings.py) TEMPLATE_LOADERS
-- 
https://code.launchpad.net/~rvb/maas/maas-fix-demo/+merge/95916
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/maas-fix-demo into lp:maas.

=== modified file 'src/maas/demo.py'
--- src/maas/demo.py	2012-02-10 17:29:17 +0000
+++ src/maas/demo.py	2012-03-05 15:20:24 +0000
@@ -14,5 +14,10 @@
 from maas.settings import *
 from maas.development import *
 
+MIDDLEWARE_CLASSES += (
+    'maasserver.middleware.ConsoleExceptionMiddleware',
+    'debug_toolbar.middleware.DebugToolbarMiddleware',
+)
+
 # This should match the setting in Makefile:pserv.pid.
 PSERV_URL = "http://localhost:8001/api";

=== modified file 'src/maas/development.py'
--- src/maas/development.py	2012-03-02 13:20:37 +0000
+++ src/maas/development.py	2012-03-05 15:20:24 +0000
@@ -41,16 +41,6 @@
 # Example: "/home/media/media.lawrence.com/media/"
 MEDIA_ROOT = os.path.join(os.getcwd(), "tmp")
 
-MIDDLEWARE_CLASSES += (
-    'maasserver.middleware.ConsoleExceptionMiddleware',
-    'debug_toolbar.middleware.DebugToolbarMiddleware',
-)
-
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-)
-
 INSTALLED_APPS += (
     'django.contrib.admin',
     'django.contrib.admindocs',