[Mpuls-commits] r3090 - in base/trunk: . mpulsweb/config

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-06-24 16:18:21 +0200 (Thu, 24 Jun 2010)
New Revision: 3090

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/config/environment.py
Log:
* mpulsweb/config/environment.py (load_environment): Take the
cache directory from Pylon's config instead of app_conf.  This
allows setting the cache_dir in the DEFAULT section of the
ini-file.  In config the cache directory is stored under a
different key: Pylons store the value of cache_dir in config under
the key pylons.cache_dir and the removes the cache_dir key.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-06-24 14:04:23 UTC (rev 3089)
+++ base/trunk/ChangeLog	2010-06-24 14:18:21 UTC (rev 3090)
@@ -1,3 +1,12 @@
+2010-06-24  Bernhard Herzog  <bh at intevation.de>
+
+	* mpulsweb/config/environment.py (load_environment): Take the
+	cache directory from Pylon's config instead of app_conf.  This
+	allows setting the cache_dir in the DEFAULT section of the
+	ini-file.  In config the cache directory is stored under a
+	different key: Pylons store the value of cache_dir in config under
+	the key pylons.cache_dir and the removes the cache_dir key.
+
 2010-06-24  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* mpulsweb/templates/casemanagement/main.mako: Do not allow to create

Modified: base/trunk/mpulsweb/config/environment.py
===================================================================
--- base/trunk/mpulsweb/config/environment.py	2010-06-24 14:04:23 UTC (rev 3089)
+++ base/trunk/mpulsweb/config/environment.py	2010-06-24 14:18:21 UTC (rev 3090)
@@ -97,7 +97,7 @@
 
     # Create the Mako TemplateLookup, with the default auto-escaping
     module_directory = config.get('mpuls.app.path.template_cache',
-                                  os.path.join(app_conf['cache_dir'],
+                                  os.path.join(config['pylons.cache_dir'],
                                                'templates'))
     config['pylons.g'].mako_lookup = \
         TemplateLookup(directories=paths['templates'],