misc tidy

Author: casperdcl

shtab/__init__.py

@@ -143,10 +143,6 @@ def wordify(string):
 
 def get_public_subcommands(sub):
     """Get all the publicly-visible subcommands for a given subparser."""
-    # NOTE: public subcommands have their primary name listed in the result of
-    # `_get_subactions()`. We use this to get the parser for each subcommand and
-    # compare all the choices (including aliases!) to the set of known-public
-    # parsers.
     public_parsers = {id(sub.choices[i.dest]) for i in sub._get_subactions()}
     return {k for k, v in sub.choices.items() if id(v) in public_parsers}
 
@@ -214,9 +210,6 @@ def recurse(parser, prefix):
                 # choices (including subparsers & shtab `.complete` functions)
                 log.debug("choices:{}:{}".format(prefix, sorted(positional.choices)))
 
-                if isinstance(positional.choices, dict):
-                    public_cmds = get_public_subcommands(positional)
-
                 this_positional_choices = []
                 for choice in positional.choices:
                     if isinstance(choice, Choice):
@@ -235,6 +228,7 @@ def recurse(parser, prefix):
                     elif isinstance(positional.choices, dict):
                         # subparser, so append to list of subparsers & recurse
                         log.debug("subcommand:%s", choice)
+                        public_cmds = get_public_subcommands(positional)
                         if choice in public_cmds:
                             discovered_subparsers.append(str(choice))
                             this_positional_choices.append(str(choice))