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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-03-01 14:38:39 +0100 (Mon, 01 Mar 2010)
New Revision: 1875

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/mpulsweb/lib/config.py
Log:
* mpulsweb/lib/config.py (unmergable_dict, unmergeable_dict): Fix
spelling of "mergeable".


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-03-01 12:08:48 UTC (rev 1874)
+++ wasko/branches/2.0/ChangeLog	2010-03-01 13:38:39 UTC (rev 1875)
@@ -1,5 +1,10 @@
 2010-03-01  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/lib/config.py (unmergable_dict, unmergeable_dict): Fix
+	spelling of "mergeable".
+
+2010-03-01  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/lib/config.py (merge): Expand doc-string and mention
 	unmergable_dict
 

Modified: wasko/branches/2.0/mpulsweb/lib/config.py
===================================================================
--- wasko/branches/2.0/mpulsweb/lib/config.py	2010-03-01 12:08:48 UTC (rev 1874)
+++ wasko/branches/2.0/mpulsweb/lib/config.py	2010-03-01 13:38:39 UTC (rev 1875)
@@ -47,7 +47,7 @@
     The recursive update of dictionaries makes it difficult to have
     dictionaries as values where the user should be able to add keys.
     Simply using a dictionary object that is not a direct instance of
-    dict works around the recursive merge.  The unmergable_dict class
+    dict works around the recursive merge.  The unmergeable_dict class
     can be used to create instances like this.
     """
     changes = []
@@ -63,7 +63,7 @@
     a.update(changes)
 
 
-class unmergable_dict(dict):
+class unmergeable_dict(dict):
 
     """Dict-equivalent for default values that should not be merged recursively.
     """