Appended [1:] to sys.argv refs for readability

Author: adamlui

remove-json-keys/src/remove_json_keys/lib/log.py

@@ -69,13 +69,13 @@ def cmd_docs_url_exit(cli, msg='', cmd='help'):
     sys.exit(1)
 
 def debug(msg, cli=None, *args, **kwargs):
-    if '--debug' not in sys.argv: return
+    if '--debug' not in sys.argv[1:]: return
 
     # Init --debug [target]
     debug_key=None
-    debug_argidx = sys.argv.index('--debug')
-    if debug_argidx +1 < len(sys.argv) and not sys.argv[debug_argidx +1].startswith('-'):
-        debug_key = sys.argv[debug_argidx +1].replace('-', '_')
+    debug_argidx = sys.argv[1:].index('--debug')
+    if debug_argidx +2 < len(sys.argv) and not sys.argv[debug_argidx +2].startswith('-'):
+        debug_key = sys.argv[debug_argidx +2].replace('-', '_')
 
     if cli: # init data line
         if debug_key:

remove-json-keys/src/remove_json_keys/lib/settings.py

@@ -95,7 +95,7 @@ def load(cli):
                     argparse_kwargs['action'] = 'store_false' if argparse_kwargs['action'] == 'store_true' \
                                            else 'store_true'
                 for arg in args:
-                    if arg in sys.argv:
+                    if arg in sys.argv[1:]:
                         log.warn_legacy_option(cli, arg, source='cli')
                         break
         argp.add_argument(*args, **argparse_kwargs)
@@ -107,7 +107,7 @@ def load(cli):
     if unknown_args and not all(any(arg == exempt for exempt in exempt_flags) for arg in unknown_args):
         log.cmd_docs_url_exit(cli, f"{cli.msgs.err_UNRECOGNIZED_ARGS}: {' '.join(unknown_args)}", cmd='help')
     for ctrl_key, ctrl in vars(controls).items(): # process subcmds
-        if getattr(ctrl, 'subcmd', False) and next(arg for arg in ctrl.args if arg.startswith('--'))[2:] in sys.argv:
+        if getattr(ctrl, 'subcmd', False) and next(arg for arg in ctrl.args if arg.startswith('--'))[2:] in sys.argv[1:]:
             setattr(parsed_args, ctrl_key, True)
     applied_args = []
     for arg in sys.argv[1:]:

translate-messages/src/translate_messages/lib/log.py

@@ -69,13 +69,13 @@ def cmd_docs_url_exit(cli, msg='', cmd='help'):
     sys.exit(1)
 
 def debug(msg, cli=None, *args, **kwargs):
-    if '--debug' not in sys.argv: return
+    if '--debug' not in sys.argv[1:]: return
 
     # Init --debug [target]
     debug_key=None
-    debug_argidx = sys.argv.index('--debug')
-    if debug_argidx +1 < len(sys.argv) and not sys.argv[debug_argidx +1].startswith('-'):
-        debug_key = sys.argv[debug_argidx +1].replace('-', '_')
+    debug_argidx = sys.argv[1:].index('--debug')
+    if debug_argidx +2 < len(sys.argv) and not sys.argv[debug_argidx +2].startswith('-'):
+        debug_key = sys.argv[debug_argidx +2].replace('-', '_')
 
     if cli: # init data line
         if debug_key:

translate-messages/src/translate_messages/lib/settings.py

@@ -105,7 +105,7 @@ def load(cli):
                     argparse_kwargs['action'] = 'store_false' if argparse_kwargs['action'] == 'store_true' \
                                            else 'store_true'
                 for arg in args:
-                    if arg in sys.argv:
+                    if arg in sys.argv[1:]:
                         log.warn_legacy_option(cli, arg, source='cli')
                         break
         argp.add_argument(*args, **argparse_kwargs)
@@ -117,7 +117,7 @@ def load(cli):
     if unknown_args and not all(any(arg == exempt for exempt in exempt_flags) for arg in unknown_args):
         log.cmd_docs_url_exit(cli, f"{cli.msgs.err_UNRECOGNIZED_ARGS}: {' '.join(unknown_args)}", cmd='help')
     for ctrl_key, ctrl in vars(controls).items(): # process subcmds
-        if getattr(ctrl, 'subcmd', False) and next(arg for arg in ctrl.args if arg.startswith('--'))[2:] in sys.argv:
+        if getattr(ctrl, 'subcmd', False) and next(arg for arg in ctrl.args if arg.startswith('--'))[2:] in sys.argv[1:]:
             setattr(parsed_args, ctrl_key, True)
     applied_args = []
     for arg in sys.argv[1:]: