Changeset 616:1ecc55248c5a

Timestamp:

11/06/12 14:42:30 (11 months ago)

Author:

Santiago Piccinini (SAn) <spiccinini@…>

Branch:

default

rebase_source:

a4c148b18540592b04653e81e01c2a9562560a5e

Message:

Some cleaned-up to settings.py

Files:

• cyclope/middleware.py (modified) (3 diffs)
• cyclope/settings.py (modified) (4 diffs)
• demo/cyclope_project/db/site.db (modified) (previous)

cyclope/middleware.py

@@ -24 +24 @@
 
 import cyclope
+import cyclope.settings # Leave this here
 
 class LayoutMiddleware(object):
@@ -37 +38 @@
                 request.session['layout'] = layout
                 request.session['layout_template'] = layout.get_template_path()
-                
+
             else:
                 if request.session.has_key('layout'):
@@ -49 +50 @@
                 request.session['layout_template'] = cyclope.settings.CYCLOPE_DEFAULT_TEMPLATE
 
-                
+

cyclope/settings.py

@@ -48 +48 @@
 """
 
-import sys, os
+import os
+import sys
 
 from django.conf import settings
@@ -111 +112 @@
 CYCLOPE_PROJECT_NAME = os.path.basename(CYCLOPE_PROJECT_PATH)
 
+CYCLOPE_BASE_CONTENT_TYPES = site.base_content_types
+
 import themes
 
@@ -131 +134 @@
     return site_settings
 
-CYCLOPE_BASE_CONTENT_TYPES = site.base_content_types
-
-CYCLOPE_SITE_SETTINGS = get_site_settings()
-
-# If the site has already been set up we read some settings
-# and make them available at module level
-if CYCLOPE_SITE_SETTINGS is not None:
-    CYCLOPE_BASE_URL = "http://"+ CYCLOPE_SITE_SETTINGS.site.domain
+def populate_from_site_settings(site_settings):
+    # Read some settings and make them available at module level
+    CYCLOPE_SITE_SETTINGS = site_settings
+    CYCLOPE_BASE_URL = "http://" + CYCLOPE_SITE_SETTINGS.site.domain # FIXME: could be https
     CYCLOPE_CURRENT_THEME = CYCLOPE_SITE_SETTINGS.theme
     if CYCLOPE_CURRENT_THEME in themes.get_local_themes():
@@ -159 +158 @@
                 CYCLOPE_DEFAULT_LAYOUT.template)
 
-        #TODO(nicoechaniz): fix this workaround. It's here for migrations on the Layout model, which fail to complete with a DatabaseError when this module is imported. Eg: cyclope/migrations/0011...
+        # TODO(nicoechaniz): fix this workaround. It's here for migrations on the
+        # Layout model, which fail to complete with a DatabaseError when this
+        # module is imported. Eg: cyclope/migrations/0011...
         except DatabaseError:
             pass
+
+    # Update the settings module with the settings
+    for name, value in locals().copy().iteritems():
+        if name.startswith("CYCLOPE"):
+            globals()[name] = value
+
+CYCLOPE_SITE_SETTINGS = get_site_settings()
+populate_from_site_settings(CYCLOPE_SITE_SETTINGS)
 
 def _refresh_site_settings(sender, instance, created, **kwargs):