Fix lint issues across PR files

- setup.py: rename loop variable shadowing parameter (B020)
- _util.py: remove unused registry import (F401), use specific except clause (E722, B904)
- test_cli_app.py: use dict literals instead of dict() (C408)
- main.py: extract _try_static_group to reduce complexity (C901)

Author: honnibal

setup.py

@@ -158,10 +158,10 @@ def _minimal_ext_cmd(cmd):
 
 
 def clean(path):
-    for path in path.glob("**/*"):
-        if path.is_file() and path.suffix in (".so", ".cpp", ".html"):
-            print(f"Deleting {path.name}")
-            path.unlink()
+    for child in path.glob("**/*"):
+        if child.is_file() and child.suffix in (".so", ".cpp", ".html"):
+            print(f"Deleting {child.name}")
+            child.unlink()
 
 
 def setup_package():

spacy/cli/_util.py

@@ -26,7 +26,6 @@
     ENV_VARS,
     import_file,
     logger,
-    registry,
     run_command,
 )
 
@@ -206,8 +205,8 @@ def get_git_version(
     """
     try:
         ret = run_command("git --version", capture=True)
-    except:
-        raise RuntimeError(error)
+    except Exception as err:
+        raise RuntimeError(error) from err
     stdout = ret.stdout.strip()
     if not stdout or not stdout.startswith("git version"):
         return 0, 0

spacy/tests/test_cli_app.py

@@ -288,30 +288,30 @@ def test_find_function_invalid():
 example_ents = ["O", "O", "I-ANIMAL"]
 example_spans = [(2, 3, "ANIMAL")]
 
-TRAIN_EXAMPLE_1 = dict(
-    words=example_words_1,
-    lemmas=example_lemmas_1,
-    tags=example_tags,
-    morphs=example_morphs,
-    deps=example_deps,
-    heads=[1, 1, 1],
-    pos=example_pos,
-    ents=example_ents,
-    spans=example_spans,
-    cats={"CAT": 1.0, "DOG": 0.0},
-)
-TRAIN_EXAMPLE_2 = dict(
-    words=example_words_2,
-    lemmas=example_lemmas_2,
-    tags=example_tags,
-    morphs=example_morphs,
-    deps=example_deps,
-    heads=[1, 1, 1],
-    pos=example_pos,
-    ents=example_ents,
-    spans=example_spans,
-    cats={"CAT": 0.0, "DOG": 1.0},
-)
+TRAIN_EXAMPLE_1 = {
+    "words": example_words_1,
+    "lemmas": example_lemmas_1,
+    "tags": example_tags,
+    "morphs": example_morphs,
+    "deps": example_deps,
+    "heads": [1, 1, 1],
+    "pos": example_pos,
+    "ents": example_ents,
+    "spans": example_spans,
+    "cats": {"CAT": 1.0, "DOG": 0.0},
+}
+TRAIN_EXAMPLE_2 = {
+    "words": example_words_2,
+    "lemmas": example_lemmas_2,
+    "tags": example_tags,
+    "morphs": example_morphs,
+    "deps": example_deps,
+    "heads": [1, 1, 1],
+    "pos": example_pos,
+    "ents": example_ents,
+    "spans": example_spans,
+    "cats": {"CAT": 0.0, "DOG": 1.0},
+}
 
 
 @pytest.mark.slow

spacy_cli/main.py

@@ -38,24 +38,28 @@ def _try_static(argv: Iterable[str]):
         template = manifest["errors"]["unknown_command"]
         return template.replace(UNKNOWN_COMMAND_TOKEN, first), 2
     if first in known_groups:
-        if len(args) == 1 or args[1] in HELP_OPTIONS:
-            if plugin_command_names:
-                return None
-            return manifest["group_help"][first], 0
-        second = args[1]
-        if second not in known_groups[first]:
-            if plugin_command_names:
-                return None
-            template = manifest["errors"]["unknown_subcommand"][first]
-            return template.replace(UNKNOWN_SUBCOMMAND_TOKEN, second), 2
-        if any(arg in HELP_OPTIONS for arg in args[2:]):
-            return manifest["command_help"][f"{first} {second}"], 0
-        return None
+        return _try_static_group(args, first, manifest, known_groups, plugin_command_names)
     if any(arg in HELP_OPTIONS for arg in args[1:]):
         return manifest["command_help"][first], 0
     return None
 
 
+def _try_static_group(args, first, manifest, known_groups, plugin_command_names):
+    if len(args) == 1 or args[1] in HELP_OPTIONS:
+        if plugin_command_names:
+            return None
+        return manifest["group_help"][first], 0
+    second = args[1]
+    if second not in known_groups[first]:
+        if plugin_command_names:
+            return None
+        template = manifest["errors"]["unknown_subcommand"][first]
+        return template.replace(UNKNOWN_SUBCOMMAND_TOKEN, second), 2
+    if any(arg in HELP_OPTIONS for arg in args[2:]):
+        return manifest["command_help"][f"{first} {second}"], 0
+    return None
+
+
 def main(argv: Optional[Iterable[str]] = None) -> None:
     args = sys.argv[1:] if argv is None else list(argv)
     try: