auto-walrus 0.3.3__py3-none-any.whl → 0.4.0__py3-none-any.whl

{auto_walrus-0.3.3.dist-info → auto_walrus-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: auto-walrus
-Version: 0.3.3
+Version: 0.4.0
 Summary: Automatically apply the awesome walrus operator
 Project-URL: Homepage, https://github.com/MarcoGorelli/auto-walrus
 Project-URL: Bug Tracker, https://github.com/MarcoGorelli/auto-walrus
@@ -10,6 +10,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.8
+Requires-Dist: tomli; python_version < '3.11'
 Description-Content-Type: text/markdown
 
 <h1 align="center">
@@ -44,7 +45,7 @@ Sample `.pre-commit-config.yaml`:
 
 ```yaml
 -   repo: https://github.com/MarcoGorelli/auto-walrus
-    rev: v0.2.2
+    rev: 0.4.0
     hooks:
     -   id: auto-walrus
 ```

auto_walrus-0.4.0.dist-info/RECORD

@@ -0,0 +1,6 @@
+auto_walrus.py,sha256=oI_1v09aD6tuvgXz7_BHi6lUt4xWgjjxSeSzFz_dWYM,12958
+auto_walrus-0.4.0.dist-info/METADATA,sha256=vPWs4IE0XtXq_f2hZ98irkRjw0mM_QLRd9n6J-Pvi5c,2981
+auto_walrus-0.4.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+auto_walrus-0.4.0.dist-info/entry_points.txt,sha256=E-31QDdV5kzcjR9avgfwLt-i2Pc6c_zUa-knm__GCHo,49
+auto_walrus-0.4.0.dist-info/licenses/LICENSE,sha256=YhJBcZzQmTfUwcrA-3FDZB3hiSIawDPD-VJSugAZXLY,1071
+auto_walrus-0.4.0.dist-info/RECORD,,

{auto_walrus-0.3.3.dist-info → auto_walrus-0.4.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.22.5
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any

auto_walrus.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import argparse
 import ast
+import dataclasses
 import os
 import pathlib
 import re
@@ -30,6 +31,12 @@ EXCLUDES = (
 )
 
 
+@dataclasses.dataclass
+class Config:
+    line_length: int
+    unsafe: bool = False
+
+
 def name_lineno_coloffset_iterable(
     tokens: Iterable[Token],
 ) -> list[tuple[str, int, int]]:
@@ -193,6 +200,7 @@ def related_vars_are_unused(
 
 def visit_function_def(
     node: ast.FunctionDef,
+    config: Config,
 ) -> list[tuple[Token, Token]]:
     names = set()
     assignments: set[Token] = set()
@@ -204,7 +212,7 @@ def visit_function_def(
     related_vars: dict[str, list[Token]] = {}
     in_body_vars: dict[Token, set[Token]] = {}
 
-    for _node in node.body:
+    for _node in ast.walk(node) if config.unsafe else node.body:
         if isinstance(_node, ast.Assign):
             process_assign(_node, assignments, related_vars)
         elif isinstance(_node, ast.If):
@@ -255,7 +263,7 @@ def visit_function_def(
 
 def auto_walrus(
     content: str,
-    line_length: int,
+    config: Config,
 ) -> str | None:
     lines = content.splitlines()
     try:
@@ -266,7 +274,7 @@ def auto_walrus(
     walruses = []
     for node in ast.walk(tree):
         if isinstance(node, ast.FunctionDef):
-            walruses.extend(visit_function_def(node))
+            walruses.extend(visit_function_def(node, config))
     lines_to_remove = []
     walruses = sorted(walruses, key=lambda x: (-x[1][1], -x[1][2]))
 
@@ -290,13 +298,13 @@ def auto_walrus(
             line_with_walrus = left_bit + replace + right_bit
         else:
             line_with_walrus = left_bit + "(" + replace + ")" + right_bit
-        if len(line_with_walrus) > line_length:
+        if len(line_with_walrus) > config.line_length:
             # don't rewrite if it would split over multiple lines
             continue
         # replace assignment
         line_without_assignment = (
-            f"{lines[_assignment[1]-1][:_assignment[2]]}"
-            f"{lines[_assignment[1]-1][_assignment[4]:]}"
+            f"{lines[_assignment[1] - 1][: _assignment[2]]}"
+            f"{lines[_assignment[1] - 1][_assignment[4] :]}"
         )
         if (ENDS_WITH_COMMENT.search(lines[_assignment[1] - 1]) is not None) or (
             ENDS_WITH_COMMENT.search(lines[_if_statement[1] - 1]) is not None
@@ -348,7 +356,7 @@ def _get_config(paths: list[pathlib.Path]) -> dict[str, Any]:
 
 def main(argv: Sequence[str] | None = None) -> int:  # pragma: no cover
     parser = argparse.ArgumentParser()
-    parser.add_argument("paths", nargs="*")
+    parser.add_argument("paths", nargs="+", metavar="path")
     parser.add_argument(
         "--files",
         help="Regex pattern with which to match files to include",
@@ -361,18 +369,24 @@ def main(argv: Sequence[str] | None = None) -> int:  # pragma: no cover
         required=False,
         default=r"^$",
     )
+    parser.add_argument(
+        "--unsafe",
+        action="store_true",
+        help="Also process if statements inside other blocks (like for loops)",
+    )
     # black formatter's default
     parser.add_argument("--line-length", type=int, default=88)
     args = parser.parse_args(argv)
     paths = [pathlib.Path(path).resolve() for path in args.paths]
 
     # Update defaults from pyproject.toml if present
-    config = {k.replace("-", "_"): v for k, v in _get_config(paths).items()}
-    parser.set_defaults(**config)
+    defaults = {k.replace("-", "_"): v for k, v in _get_config(paths).items()}
+    parser.set_defaults(**defaults)
     args = parser.parse_args(argv)
 
     ret = 0
 
+    config = Config(line_length=args.line_length, unsafe=args.unsafe)
     for path in paths:
         if path.is_file():
             filepaths = iter((path,))
@@ -382,7 +396,7 @@ def main(argv: Sequence[str] | None = None) -> int:  # pragma: no cover
                 for p in path.rglob("*")
                 if re.search(args.files, p.as_posix(), re.VERBOSE)
                 and not re.search(args.exclude, p.as_posix(), re.VERBOSE)
-                and not re.search(EXCLUDES, p.as_posix())
+                and not re.search(EXCLUDES, p.relative_to(path).as_posix())
                 and p.suffix == ".py"
             )
 
@@ -392,10 +406,7 @@ def main(argv: Sequence[str] | None = None) -> int:  # pragma: no cover
                     content = fd.read()
             except UnicodeDecodeError:
                 continue
-            new_content = auto_walrus(
-                content,
-                line_length=args.line_length,
-            )
+            new_content = auto_walrus(content, config)
             if new_content is not None and content != new_content:
                 sys.stdout.write(f"Rewriting {filepath}\n")
                 with open(filepath, "w", encoding="utf-8") as fd:

auto_walrus-0.3.3.dist-info/RECORD

@@ -1,6 +0,0 @@
-auto_walrus.py,sha256=VI_WBQuwOu7OUY6fkul4wqRKedOWF9tt8U8GV8ZJiwk,12579
-auto_walrus-0.3.3.dist-info/METADATA,sha256=3ArSFbOHe9SGGq8Z_LtsQih34fjCM23Z0posm0Lqf_M,2936
-auto_walrus-0.3.3.dist-info/WHEEL,sha256=as-1oFTWSeWBgyzh0O_qF439xqBe6AbBgt4MfYe5zwY,87
-auto_walrus-0.3.3.dist-info/entry_points.txt,sha256=E-31QDdV5kzcjR9avgfwLt-i2Pc6c_zUa-knm__GCHo,49
-auto_walrus-0.3.3.dist-info/licenses/LICENSE,sha256=YhJBcZzQmTfUwcrA-3FDZB3hiSIawDPD-VJSugAZXLY,1071
-auto_walrus-0.3.3.dist-info/RECORD,,