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

["André Erdmann" <dywi@mailerd.de>]

commit:     37545b5c22386e42805c644bab9c2ea7952ccf17
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Aug  2 14:57:04 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Aug  2 14:57:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=37545b5c

config: update entry map comment

---
 roverlay/config/entrymap.py |   15 +++++----------
 roverlay/config/tree.py     |   19 +++++++------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/roverlay/config/entrymap.py b/roverlay/config/entrymap.py
index 078ddfe..0119983 100644
--- a/roverlay/config/entrymap.py
+++ b/roverlay/config/entrymap.py
@@ -1,6 +1,4 @@
-# <header!!>
-
-# TODO/FIXME comments
+# R Overlay -- config entry map
 
 # the map of config entries (keep keys in lowercase)
 #  format is config_entry = None|''|str|dict(...), where
@@ -10,10 +8,10 @@
 #   dict() means that config_entry has options / diverts from defaults.
 #
 # known dict keys are:
-# * path = str | list of str -- path of this entry in the config tree
+# * path        = str | list of str -- path of this entry in the config tree
+# * description = str               -- description
 #
 # * value_type, you can specify:
-# ** slist   -- value is a whitespace-separated list (replaced by list)
 # ** list    -- value is a whitespace-separated list
 # ** int     -- integer
 # ** str     -- [explicit string conversion]
@@ -23,14 +21,13 @@
 #                (pwd + path)
 # ** fs_dir  -- fs_abs and value must be a dir if it exists
 # ** fs_file -- fs_abs and value must be a file if it exists
-# TODO** fs_prog -- fs_file (and fs_path) and value must be executable (TODO)
 # ** regex   -- value is a regex and will be compiled (re.compile(..))
 #
 #   multiple types are generally not supported ('this is an int or a str'),
 #   but subtypes are ('list of yesno'), which can be specified by either
 #   using a list of types ['list', 'yesno'] or by separating the types
 #   with a colon 'list:yesno', which is parsed in a left-to-right order.
-#   Nested subtypes such as list:slist:int:fs_file:list may lead to errors.
+#   Nested subtypes such as list:int:fs_file:list may lead to errors.
 #
 
 fs_file    = 'fs_file'
@@ -173,7 +170,7 @@ CONFIG_ENTRY_MAP = dict (
 
 	# == overlay ==
 
-	# FIXME key is not in use
+	# COULDFIX key is not in use
 	ebuild_header = dict (
 		value_type  = fs_file,
 		description = '''NOT IN USE.
@@ -312,5 +309,3 @@ def prune_description():
 				del entry ['description']
 			elif 'desc' in entry:
 				del entry ['desc']
-
-

diff --git a/roverlay/config/tree.py b/roverlay/config/tree.py
index dd14fb7..dfc6289 100644
--- a/roverlay/config/tree.py
+++ b/roverlay/config/tree.py
@@ -59,21 +59,16 @@ class ConfigTree ( object ):
 
 		# strategy = theirs
 		# unsafe operation (empty values,...)
-		if not _dict:
-			pass
+		if _dict and isinstance ( _dict, dict ):
 
-		elif not isinstance ( _dict, dict ):
-			raise Exception ( "bad usage" )
+			u = { k : v for ( k, v ) in _dict.items() if v or v == 0 }
+			merge_dict ( self._config, u )
 
-		else:
-			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 )
+		elif not _dict:
+			pass
 
-			merge_dict ( self._config, u )
+		else:
+			raise Exception ( "bad usage" )
 
 	# --- end of merge_with (...) ---