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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2011-07-05 16:02:46 +0200 (Tue, 05 Jul 2011)
New Revision: 5153

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/lib/base.py
Log:
* mpulsweb/lib/base.py (BaseController.merge_dict): Removed. It's
not used anywhere in base or any of the mpuls applications.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-07-01 18:24:38 UTC (rev 5152)
+++ base/trunk/ChangeLog	2011-07-05 14:02:46 UTC (rev 5153)
@@ -1,3 +1,8 @@
+2011-07-05  Bernhard Herzog  <bh at intevation.de>
+
+	* mpulsweb/lib/base.py (BaseController.merge_dict): Removed. It's
+	not used anywhere in base or any of the mpuls applications.
+
 2011-07-01  Bernhard Herzog  <bh at intevation.de>
 
 	* mpulsweb/model/case.py (Field): Fix typo in doc-string.

Modified: base/trunk/mpulsweb/lib/base.py
===================================================================
--- base/trunk/mpulsweb/lib/base.py	2011-07-01 18:24:38 UTC (rev 5152)
+++ base/trunk/mpulsweb/lib/base.py	2011-07-05 14:02:46 UTC (rev 5153)
@@ -230,9 +230,3 @@
 
     def showError(self, err=None):
         raise HTTPNotFound()
-
-    def merge_dict(self, leftd, rightd):
-        for key in rightd.keys():
-            # overwrite key value pairs
-            leftd[key] = rightd[key]
-        return leftd