← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~rvb/maas/maas-fix-local-settings into lp:maas

 

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

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/maas-fix-local-settings/+merge/96978

This branches fixes settings.py to use "from maas_local_settings import *" instead of "from maas_local_settings import DEBUG, FORCE_SCRIPT_NAME".  The improvement is that now local settings can contain only DEBUG or FORCE_SCRIPT_NAME.  Previously, if for instance DEBUG was missing, FORCE_SCRIPT_NAME would not be taken into account.
-- 
https://code.launchpad.net/~rvb/maas/maas-fix-local-settings/+merge/96978
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/maas-fix-local-settings into lp:maas.
=== modified file 'src/maas/settings.py'
--- src/maas/settings.py	2012-03-09 13:00:59 +0000
+++ src/maas/settings.py	2012-03-12 08:43:19 +0000
@@ -24,10 +24,9 @@
 # Used to set a prefix in front of every URL.
 FORCE_SCRIPT_NAME = None
 
-# Allow the user to override DEBUG and FORCE_SCRIPT_NAME in
-# maas_local_settings.
+# Allow the user to override settings in maas_local_settings.
 try:
-    from maas_local_settings import DEBUG, FORCE_SCRIPT_NAME
+    from maas_local_settings import * # NOQA
 except ImportError:
     pass