1818 except (ImportError , LookupError ):
1919 __version__ = "UNKNOWN"
2020__author__ = "Casper da Costa-Luis <[email protected] >" 21- __date__ = "2016-2020 "
21+ __date__ = "2016-2023 "
2222__licence__ = __license__ = "[MPLv2.0](https://mozilla.org/MPL/2.0/)"
2323__copyright__ = ' ' .join (("Copyright (c)" , __date__ , __author__ , __licence__ ))
2424
2525log = logging .getLogger (__name__ )
2626
27- RE_ARG_ONCE = re .compile (r"(?<!Optional\(|neOrMore\()"
28- r"Argument\('(\S+?)', (\S+?), (\S+?)\)" )
29- RE_ARG_STAR = re .compile (r"Optional\(OneOrMore\(Argument\("
30- r"'(\S+?)', (\S+?), (\S+?)\)\)\)" )
31- RE_ARG_PLUS = re .compile (r"(?<!Optional\()"
32- r"OneOrMore\(Argument\('(\S+?)', (\S+?), (\S+?)\)\)" )
27+ RE_ARG_ONCE = re .compile (r"(?<!Optional\(|neOrMore\()Argument\('(\S+?)', (\S+?), (\S+?)\)" )
28+ RE_ARG_STAR = re .compile (r"Optional\(OneOrMore\(Argument\('(\S+?)', (\S+?), (\S+?)\)\)\)" )
29+ RE_ARG_PLUS = re .compile (r"(?<!Optional\()OneOrMore\(Argument\('(\S+?)', (\S+?), (\S+?)\)\)" )
3330RE_ARG_QEST = re .compile (r"Optional\(Argument\('(\S+?)', (\S+?), (\S+?)\)\)" )
3431
3532
@@ -46,8 +43,8 @@ def docopt_parser(doc='', logLevel=logging.NOTSET, **_kwargs):
4643 doc : docopt compatible, with optional type specifiers [default: '':str].
4744 """
4845 options , args = parse_defaults (doc )
49- log .log (logLevel , "options:%r" % options )
50- log .log (logLevel , "args:%r" % args )
46+ log .log (logLevel , "options:%r" , options )
47+ log .log (logLevel , "args:%r" , args )
5148 usage = printable_usage (doc )
5249 pattern = parse_pattern (formal_usage (usage ), options )
5350 # pattern_arguments = pattern.flat(Argument)
@@ -65,8 +62,8 @@ def docopt_parser(doc='', logLevel=logging.NOTSET, **_kwargs):
6562 opt_names .extend (filter (lambda x : x is not None , [opt .short , opt .long ]))
6663 opts .append (opt )
6764 else :
68- log .warn ("dropped:%r" % opt )
69- log .log (logLevel , "opts:%r" % opts )
65+ log .warn ("dropped:%r" , opt )
66+ log .log (logLevel , "opts:%r" , opts )
7067
7168 if 'version' in _kwargs :
7269 if not any (o .name == '--version' for o in opts ):
@@ -180,15 +177,15 @@ def argopt(doc='', argparser=ArgumentParser, formatter_class=RawDescriptionHelpF
180177 parser = argparser (formatter_class = formatter_class , ** _kwargs )
181178
182179 for a in args :
183- log .log (logLevel , "a:%r" % a )
180+ log .log (logLevel , "a:%r" , a )
184181 k = {}
185182 if a .type is not None :
186183 k ['type' ] = a .type
187184 if a .value is not None :
188185 k ['default' ] = a .value
189186 parser .add_argument (a .name_stripped , nargs = a .nargs , help = a .desc , ** k )
190187 for o in opts :
191- log .log (logLevel , "o:%r" % o )
188+ log .log (logLevel , "o:%r" , o )
192189 if o .name in ('-h' , '--help' ):
193190 continue
194191 if '--version' == o .name :
0 commit comments