[Mpuls-commits] r3372 - in base/trunk: . mpulsweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-08-10 22:16:22 +0200 (Tue, 10 Aug 2010)
New Revision: 3372

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/lib/app_globals.py
Log:
* mpulsweb/lib/app_globals.py (Globals.__init__): Do not
initialize the old-style db_mapping_file anymore.  The new db
mapping should be usable for the same purpose as well.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-08-10 19:39:57 UTC (rev 3371)
+++ base/trunk/ChangeLog	2010-08-10 20:16:22 UTC (rev 3372)
@@ -1,5 +1,11 @@
 2010-08-10  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/lib/app_globals.py (Globals.__init__): Do not
+	initialize the old-style db_mapping_file anymore.  The new db
+	mapping should be usable for the same purpose as well.
+
+2010-08-10  Bernhard Herzog  <bh at intevation.de>
+
 	Break some circular imports
 
 	* mpulsweb/lib/helpers.py: Do not import anything from navigation

Modified: base/trunk/mpulsweb/lib/app_globals.py
===================================================================
--- base/trunk/mpulsweb/lib/app_globals.py	2010-08-10 19:39:57 UTC (rev 3371)
+++ base/trunk/mpulsweb/lib/app_globals.py	2010-08-10 20:16:22 UTC (rev 3372)
@@ -37,7 +37,6 @@
 
 from mpulsweb.lib.timelog import setupTimeLogging
 from mpulsweb.lib.config import MpulsAppConfig, MpulsDBMapping
-from mpulsweb.lib.security import load_db_mapping_from_file
 from mpulsweb.model.annotations import AnnotationsProvider
 
 
@@ -108,10 +107,3 @@
             setupTimeLogging(time_host, int(time_port))
         elif time_host:
             setupTimeLogging(int(time_host))
-
-        # File to remap database name
-        mapping_file = config.get('db_mapping_file')
-
-        if mapping_file:
-            load_db_mapping_from_file(mapping_file)
-