[Mpuls-commits] r2248 - in wasko/branches/2.0: . mpulsweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-03-29 18:10:20 +0200 (Mon, 29 Mar 2010)
New Revision: 2248

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/mpulsweb/lib/app_globals.py
Log:
* mpulsweb/lib/app_globals.py: Fix formatting.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-03-29 16:09:11 UTC (rev 2247)
+++ wasko/branches/2.0/ChangeLog	2010-03-29 16:10:20 UTC (rev 2248)
@@ -1,5 +1,9 @@
 2010-03-29  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/lib/app_globals.py: Fix formatting.
+
+2010-03-29  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/lib/base.py: Fix formatting.
 
 2010-03-29  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/mpulsweb/lib/app_globals.py
===================================================================
--- wasko/branches/2.0/mpulsweb/lib/app_globals.py	2010-03-29 16:09:11 UTC (rev 2247)
+++ wasko/branches/2.0/mpulsweb/lib/app_globals.py	2010-03-29 16:10:20 UTC (rev 2248)
@@ -35,7 +35,7 @@
 
 from mpulsweb.lib.timelog import setupTimeLogging
 from mpulsweb.lib.config import MpulsConfig
-from mpulsweb.lib.security import load_db_mapping_from_file 
+from mpulsweb.lib.security import load_db_mapping_from_file
 from mpulsweb.model.annotations import AnnotationsProvider
 
 
@@ -64,8 +64,9 @@
 
         # Load formed from defined location. If no location is defined. Take
         # the default which is the formed dir under public.
-        formed_dir = config.get('mpuls.app.path.formed', 
-            os.path.join(config.get('pylons.paths').get('static_files')[0], 'formed')) 
+        formed_dir = config.get('mpuls.app.path.formed',
+            os.path.join(config.get('pylons.paths').get('static_files')[0],
+                         'formed'))
         formed_file = os.path.join(formed_dir,
                                    self.mpuls_config.get('formed', 'treefile'))
         annotation_file = os.path.join(formed_dir,