[gentoo-commits] proj/R_overlay:master commit in: roverlay/config/

[André Erdmann]

commit:     415683e88e8dedcc7b84c3691213dfca2033b93f
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jul  6 22:10:24 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jul  6 22:10:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=415683e8

ConfigTree: fix merge_with (<dict>)

the config tree will now be merged recursively with the given dict

	modified:   roverlay/config/tree.py

---
 roverlay/config/tree.py |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/roverlay/config/tree.py b/roverlay/config/tree.py
index 426343e..dd14fb7 100644
--- a/roverlay/config/tree.py
+++ b/roverlay/config/tree.py
@@ -44,7 +44,19 @@ class ConfigTree ( object ):
 		return ConfigLoader ( self )
 	# --- end of get_loader (...) ---
 
-	def merge_with ( self, _dict, allow_empty_value=False ):
+	def merge_with ( self, _dict ):
+		def merge_dict ( pos, dict_to_merge ):
+			# this uses references where possible (no copy.[deep]copy,..)
+			for key, val in dict_to_merge.items():
+				if not key in pos:
+					pos [key] = val
+				elif isinstance ( pos [key], dict ):
+					merge_dict ( pos [key], val )
+				else:
+					pos [key] = val
+		# --- end of merge_dict (...) ---
+
+
 		# strategy = theirs
 		# unsafe operation (empty values,...)
 		if not _dict:
@@ -53,16 +65,15 @@ class ConfigTree ( object ):
 		elif not isinstance ( _dict, dict ):
 			raise Exception ( "bad usage" )
 
-		elif allow_empty_value:
-			self._config.update ( _dict )
-
-		elif sys.version_info >= ( 2, 7 ):
-			u = { k : v for ( k, v ) in _dict.items() if v or v == 0 }
-			self._config.update ( u )
 		else:
-			# FIXME remove < 2.7 statement, roverlay (probably) doesn't work
-			# with python version prior to 2.7
-			u = dict ( x for x in _dict.items() if x [1] or x [1] == 0 )
+			if sys.version_info >= ( 2, 7 ):
+				u = { k : v for ( k, v ) in _dict.items() if v or v == 0 }
+			else:
+				# FIXME remove < 2.7 statement, roverlay (probably) doesn't work
+				# with python version prior to 2.7
+				u = dict ( kv for kv in _dict.items() if kv [1] or kv [1] == 0 )
+
+			merge_dict ( self._config, u )
 
 	# --- end of merge_with (...) ---