[Mpuls-commits] r2208 - in wasko/branches/2.0: . mpulsweb/config

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-03-25 20:02:47 +0100 (Thu, 25 Mar 2010)
New Revision: 2208

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/mpulsweb/config/environment.py
Log:
* mpulsweb/config/environment.py: Fix formatting.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-03-25 19:01:14 UTC (rev 2207)
+++ wasko/branches/2.0/ChangeLog	2010-03-25 19:02:47 UTC (rev 2208)
@@ -1,5 +1,9 @@
 2010-03-25  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/config/environment.py: Fix formatting.
+
+2010-03-25  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/controllers/error.py: Remove unused imports.
 
 2010-03-25  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/mpulsweb/config/environment.py
===================================================================
--- wasko/branches/2.0/mpulsweb/config/environment.py	2010-03-25 19:01:14 UTC (rev 2207)
+++ wasko/branches/2.0/mpulsweb/config/environment.py	2010-03-25 19:02:47 UTC (rev 2208)
@@ -39,6 +39,7 @@
 
 log = logging.getLogger(__name__)
 
+
 def load_environment(global_conf, app_conf):
     """Configure the Pylons environment via the ``pylons.config`` object"""
     # Pylons paths
@@ -53,14 +54,14 @@
     template_urls.append(os.path.join(root, 'templates'))
 
     # Static content (images, styles, formed...)
-    static_urls = [] 
+    static_urls = []
     custom_static = global_conf.get('mpuls.app.path.public')
     if custom_static:
         log.info('Custom "public" directory: %s' % custom_static)
         static_urls.append(global_conf.get('mpuls.app.path.public'))
     static_urls.append(os.path.join(root, 'public'))
 
-    # Controllers 
+    # Controllers
     controller_url = os.path.join(root, 'controllers')
     if global_conf.get('mpuls.app.path.controllers'):
         controller_url = global_conf.get('mpuls.app.path.controllers')
@@ -80,12 +81,13 @@
     config['pylons.h'] = mpulsweb.lib.helpers
 
     # Create the Mako TemplateLookup, with the default auto-escaping
-    config['pylons.g'].mako_lookup = TemplateLookup(
-        directories=paths['templates'],
-        error_handler=handle_mako_error,
-        module_directory=os.path.join(app_conf['cache_dir'], 'templates'),
-        input_encoding='utf-8', default_filters=['escape'],
-        imports=['from webhelpers.html import escape'])
+    config['pylons.g'].mako_lookup = \
+        TemplateLookup(directories=paths['templates'],
+                       error_handler=handle_mako_error,
+                       module_directory=os.path.join(app_conf['cache_dir'],
+                                                     'templates'),
+                       input_encoding='utf-8', default_filters=['escape'],
+                       imports=['from webhelpers.html import escape'])
 
     # CONFIGURATION OPTIONS HERE (note: all config options will override
     # any Pylons config options)