refactor: use from-imports for ast, configparser, and pytest

Author: stephen-kintsugi

squawk_alembic/hook.py

@@ -1,13 +1,13 @@
 """Pre-commit hook that generates DDL via alembic upgrade --sql and lints with squawk."""
 
 import argparse
-import ast
-import configparser
 import os
 import re
 import subprocess
 import sys
 import tempfile
+from ast import Assign, Constant, Name, Tuple, iter_child_nodes, parse
+from configparser import ConfigParser, NoOptionError, NoSectionError
 from pathlib import Path
 
 _BRANCH_RE = re.compile(r"^[a-zA-Z0-9._/\-]+$")
@@ -19,12 +19,12 @@ def find_migrations_path():
     if not config_path.exists():
         return None
 
-    config = configparser.ConfigParser()
+    config = ConfigParser()
     config.read(config_path)
 
     try:
         script_location = config.get("alembic", "script_location")
-    except (configparser.NoSectionError, configparser.NoOptionError):
+    except (NoSectionError, NoOptionError):
         return None
 
     script_location = script_location.removeprefix("./")
@@ -49,35 +49,35 @@ def extract_revision_info(filepath):
     """Parse a migration file to extract revision and down_revision from module-level assignments."""
     with open(filepath) as f:
         try:
-            tree = ast.parse(f.read())
+            tree = parse(f.read())
         except SyntaxError:
             return None
 
     revision = None
     down_revision = None
 
-    for node in ast.iter_child_nodes(tree):
-        if not isinstance(node, ast.Assign):
+    for node in iter_child_nodes(tree):
+        if not isinstance(node, Assign):
             continue
-        if len(node.targets) != 1 or not isinstance(node.targets[0], ast.Name):
+        if len(node.targets) != 1 or not isinstance(node.targets[0], Name):
             continue
 
         name = node.targets[0].id
         if name == "revision":
-            if isinstance(node.value, ast.Constant) and isinstance(
+            if isinstance(node.value, Constant) and isinstance(
                 node.value.value, str
             ):
                 revision = node.value.value
         elif name == "down_revision":
-            if isinstance(node.value, ast.Constant):
+            if isinstance(node.value, Constant):
                 if isinstance(node.value.value, str):
                     down_revision = node.value.value
                 elif node.value.value is None:
                     down_revision = None
-            elif isinstance(node.value, ast.Tuple):
+            elif isinstance(node.value, Tuple):
                 values = []
                 for elt in node.value.elts:
-                    if isinstance(elt, ast.Constant) and isinstance(elt.value, str):
+                    if isinstance(elt, Constant) and isinstance(elt.value, str):
                         values.append(elt.value)
                 down_revision = tuple(values)
 

tests/test_find_migrations_path.py

@@ -1,11 +1,11 @@
 """Tests for alembic.ini auto-detection."""
 
-import pytest
+from pytest import fixture
 
 from squawk_alembic.hook import find_migrations_path
 
 
-@pytest.fixture()
+@fixture()
 def repo(tmp_path, monkeypatch):
     """Set up a fake repo directory and chdir into it."""
     monkeypatch.chdir(tmp_path)

tests/test_main.py

@@ -3,12 +3,12 @@
 import textwrap
 from unittest.mock import patch
 
-import pytest
+from pytest import fixture
 
 from squawk_alembic.hook import main
 
 
-@pytest.fixture()
+@fixture()
 def repo(tmp_path, monkeypatch):
     """Set up a fake repo with alembic config and a versions directory."""
     monkeypatch.chdir(tmp_path)

tests/test_revision_info.py

@@ -2,12 +2,12 @@
 
 import textwrap
 
-import pytest
+from pytest import fixture
 
 from squawk_alembic.hook import extract_revision_info
 
 
-@pytest.fixture()
+@fixture()
 def migration_file(tmp_path):
     """Write a migration file and return its path."""
 

tests/test_squawk_config.py

@@ -3,17 +3,17 @@
 import shutil
 import subprocess
 
-import pytest
+from pytest import fixture, mark
 
-pytestmark = pytest.mark.skipif(
+pytestmark = mark.skipif(
     shutil.which("squawk") is None, reason="squawk not installed"
 )
 
 
 SQL = "ALTER TABLE foo ADD COLUMN bar text;\n"
 
 
-@pytest.fixture()
+@fixture()
 def sql_file(tmp_path):
     path = tmp_path / "migration.sql"
     path.write_text(SQL)