Used !r in f-strings, refactored debug_argidx init for readability

Author: adamlui

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

@@ -76,13 +76,13 @@ def debug(msg: str, cli: Optional[sn] = None, *args, **kwargs) -> None:
 
     # Init --debug [target]
     debug_key=None
-    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('-', '_')
+    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('-', '_')
 
     if cli: # init data line
         if debug_key:
-            data_val = getattr(cli.config, debug_key, f'cli.config key "{debug_key}" {cli.msgs.warn_NOT_FOUND.lower()}')
+            data_val = getattr(cli.config, debug_key, f'cli.config key {debug_key!r} {cli.msgs.warn_NOT_FOUND.lower()}')
         else:
             data_val = cli.config
         msg += f'\n{colors.gry}{data_val}{colors.nc}'

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

@@ -28,6 +28,6 @@ def validate(url: str, allowed_schemes: Tuple[str, ...] = ('http', 'https'),
     if allowed_domains:
         input_domain = parsed_url.netloc.lower()
         if not any(input_domain.endswith(allowed_domain.lower()) for allowed_domain in allowed_domains):
-            raise ValueError(f"URL domain '{input_domain}' not allowed. Allowed: {allowed_domains}")
+            raise ValueError(f'URL domain {input_domain!r} not allowed. Allowed: {allowed_domains}')
 
     return url

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

@@ -76,13 +76,13 @@ def debug(msg: str, cli: Optional[sn] = None, *args, **kwargs) -> None:
 
     # Init --debug [target]
     debug_key=None
-    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('-', '_')
+    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('-', '_')
 
     if cli: # init data line
         if debug_key:
-            data_val = getattr(cli.config, debug_key, f'cli.config key "{debug_key}" {cli.msgs.warn_NOT_FOUND.lower()}')
+            data_val = getattr(cli.config, debug_key, f'cli.config key {debug_key!r} {cli.msgs.warn_NOT_FOUND.lower()}')
         else:
             data_val = cli.config
         msg += f'\n{colors.gry}{data_val}{colors.nc}'

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

@@ -28,6 +28,6 @@ def validate(url: str, allowed_schemes: Tuple[str, ...] = ('http', 'https'),
     if allowed_domains:
         input_domain = parsed_url.netloc.lower()
         if not any(input_domain.endswith(allowed_domain.lower()) for allowed_domain in allowed_domains):
-            raise ValueError(f"URL domain '{input_domain}' not allowed. Allowed: {allowed_domains}")
+            raise ValueError(f'URL domain {input_domain!r} not allowed. Allowed: {allowed_domains}')
 
     return url