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

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

commit:     43c0ad633946458d8d185e8a456a6379e55dbb82
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Sep 17 16:40:32 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Sep 17 16:40:32 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=43c0ad63

argparser: subparse_parsed()

---
 roverlay/argparser.py | 18 +++++++++++++++++-
 roverlay/argutil.py   |  4 ++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/roverlay/argparser.py b/roverlay/argparser.py
index 81b3300..04feff8 100644
--- a/roverlay/argparser.py
+++ b/roverlay/argparser.py
@@ -123,6 +123,17 @@ class RoverlayArgumentParserBase ( roverlay.argutil.ArgumentParserProxy ):
    def parse ( self, *args, **kwargs ):
       self.parse_args ( *args, **kwargs )
       parsed          = vars ( self.parsed )
+      return self.parse_parsed ( parsed )
+   # --- end of parse (...) ---
+
+   def subparse_parsed ( self, parsed ):
+      self.parsed = parsed
+      if hasattr ( self.__class__, 'PARSE_TARGETS' ):
+         for attr in self.__class__.PARSE_TARGETS:
+            getattr ( self, 'parse_' + attr )()
+   # --- end of subparse_parsed (...) ---
+
+   def parse_parsed ( self, parsed ):
       self.parsed     = parsed
       self.extra_conf = dict()
 
@@ -189,7 +200,7 @@ class RoverlayArgumentParserBase ( roverlay.argutil.ArgumentParserProxy ):
       if hasattr ( self.__class__, 'PARSE_TARGETS' ):
          for attr in self.__class__.PARSE_TARGETS:
             getattr ( self, 'parse_' + attr )()
-   # --- end of parse (...) ---
+   # --- end of parse_parsed (...) ---
 
    def setup ( self ):
       if hasattr ( self.__class__, 'SETUP_TARGETS' ):
@@ -651,6 +662,11 @@ class RoverlayArgumentParser ( RoverlayArgumentParserBase ):
 
    def parse_actions ( self ):
       self.command = self.parsed ['command']
+
+      if self.__class__.COMMAND_SUBPARSERS:
+         subparser = self.get_subparser ( self.command )
+         if hasattr ( subparser, 'subparse_parsed' ):
+            subparser.subparse_parsed ( self.parsed )
    # --- end of parse_actions (...) ---
 
 # --- end of RoverlayArgumentParser ---

diff --git a/roverlay/argutil.py b/roverlay/argutil.py
index 7c36980..b8f8363 100644
--- a/roverlay/argutil.py
+++ b/roverlay/argutil.py
@@ -314,7 +314,7 @@ class ArgumentParserProxy ( object ):
          if default is argparse.SUPPRESS:
             default_str = self.STR_SUPPRESS
 
-         elif default in { True, False }:
+         elif default is True or default is False:
             if flags & self.ARG_INVERSE:
                default_str = self.STR_FALSE if default else self.STR_TRUE
             else:
@@ -392,7 +392,7 @@ class ArgumentParserProxy ( object ):
    # --- end of parse_args (...) ---
 
    def parse ( self, *args, **kwargs ):
-      print ( "ArgumentParserProxy.parse() is deprecated. Use parse_args()." )
+      # likely overridden by derived classes
       return self.parse_args ( *args, **kwargs )
    # --- end of parse (...) ---