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

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

commit:     62c81650a1ce027d376dd04c70861a8be9faa934
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Sep  6 17:22:46 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Sep  6 17:22:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=62c81650

config tree: register_static, reset()

Optionally do not register a created ConfigTree instance as static instance.

Support for re-setting the config tree (which removes all config options from
it).

---
 roverlay/config/tree.py | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/roverlay/config/tree.py b/roverlay/config/tree.py
index 4be20c1..c87df55 100644
--- a/roverlay/config/tree.py
+++ b/roverlay/config/tree.py
@@ -31,7 +31,7 @@ class ConfigTree ( object ):
    # static access to the first created ConfigTree
    instance = None
 
-   def __init__ ( self, import_const=True ):
+   def __init__ ( self, import_const=True, register_static=None ):
       """Initializes an ConfigTree, which is a container for options/values.
       Values can be stored directly (such as the field_definitions) or
       in a tree-like { section -> subsection[s] -> option = value } structure.
@@ -41,21 +41,38 @@ class ConfigTree ( object ):
       arguments:
       * import_const -- whether to deepcopy constants into the config tree or
                         not. Copying allows faster lookups.
+      * register_static -- if True: register new instance as static
+                           if None: same as for True unless a static instance
+                                    is already registered
+                           else: do nothing
       """
-      if ConfigTree.instance is None:
-         ConfigTree.instance = self
+      if register_static is True or (
+         self.__class__.instance is None and register_static is None
+      ):
+         self.__class__.instance = self
          self.logger = logging.getLogger ( self.__class__.__name__ )
       else:
          self.logger = logging.getLogger (
-            self.__class__.__name__ + "(%i)" % id ( self ) )
+            "{}({:d}".format ( self.__class__.__name__, id ( self ) )
+         )
 
-      self._config = const.clone() if import_const else dict ()
-      self._const_imported    = import_const
-      self._field_definition  = None
-      self._use_extend_map    = None
+      self._config           = None
+      self._const_imported   = False
+      self._field_definition = None
+      self._use_extend_map   = None
 
+      self.reset ( import_const=import_const )
    # --- end of __init__ (...) ---
 
+   def reset ( self, import_const=None ):
+      if import_const is not None:
+         self._const_imported = bool ( import_const )
+
+      self._config  = const.clone() if self._const_imported else dict()
+      self._field_definition = None
+      self._use_extend_map   = None
+   # --- end of reset (...) ---
+
    def get_loader ( self ):
       """Returns a ConfigLoader for this ConfigTree."""
       return ConfigLoader ( self )