[Mpuls-commits] r765 - in wasko/branches/2.0: . waskaweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-19 18:53:13 +0100 (Tue, 19 Jan 2010)
New Revision: 765

Modified:
   wasko/branches/2.0/ChangeLog.txt
   wasko/branches/2.0/waskaweb/lib/app_globals.py
Log:
* waskaweb/lib/app_globals.py (Globals.__init__): access
pylons.config consistently as config


Modified: wasko/branches/2.0/ChangeLog.txt
===================================================================
--- wasko/branches/2.0/ChangeLog.txt	2010-01-19 17:47:59 UTC (rev 764)
+++ wasko/branches/2.0/ChangeLog.txt	2010-01-19 17:53:13 UTC (rev 765)
@@ -1,5 +1,10 @@
 2010-01-19  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/lib/app_globals.py (Globals.__init__): access
+	pylons.config consistently as config
+
+2010-01-19  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/lib/app_globals.py: Improve formatting
 
 2010-01-19  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/waskaweb/lib/app_globals.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/app_globals.py	2010-01-19 17:47:59 UTC (rev 764)
+++ wasko/branches/2.0/waskaweb/lib/app_globals.py	2010-01-19 17:53:13 UTC (rev 765)
@@ -29,7 +29,6 @@
 import traceback
 import logging
 
-import pylons
 from pylons import config
 
 from formed.meta.io.document import openDocument
@@ -56,15 +55,15 @@
         variable
         """
         # Load mpuls configuration
-        config_file = pylons.config.get('mpuls.app.config', 'default.json')
+        config_file = config.get('mpuls.app.config', 'default.json')
         if not os.path.isabs(config_file):
-            root = pylons.config.get('pylons.paths').get('root')
+            root = config.get('pylons.paths').get('root')
             config_file = os.path.join(root, '..', config_file)
 
         self.config_path = os.path.dirname(config_file)
         self.mpuls_config = MpulsConfig(config_file)
 
-        public_dir = pylons.config.get('pylons.paths').get('static_files')
+        public_dir = config.get('pylons.paths').get('static_files')
         formed_dir = os.path.join(public_dir, "formed")
         formed_file = os.path.join(formed_dir,
                                    self.mpuls_config.get('formed', 'treefile'))