Merge pull request #36 from 15r10nk/3.14

3.14

Author: 15r10nk

src/pysource_minimize/_minimize_base.py

@@ -115,6 +115,7 @@ def wrap(value):
                     ("Nonlocal", "names"),
                     ("Global", "names"),
                     ("MatchClass", "kwd_attrs"),
+                    ("Dict", "keys"),
                 ]:
                     setattr(node, name, wrap(value))
 

src/pysource_minimize/_minimize_structure.py

@@ -74,6 +74,10 @@ def minimize_expr(self, node):
             )
 
         elif isinstance(node, ast.Subscript):
+            if isinstance(node.ctx, ast.Store):
+                if self.try_node(node, ast.Name(id="new_name", ctx=ast.Store())):
+                    return
+
             self.try_only_minimize(node, node.value, node.slice)
 
         elif isinstance(node, ast.FormattedValue):
@@ -227,6 +231,41 @@ def minimize_expr(self, node):
 
         elif isinstance(node, ast.NamedExpr):
             self.try_only_minimize(node, node.target, node.value)
+
+        elif isinstance(node, ast.Interpolation):
+            if isinstance(node.format_spec, ast.JoinedStr):
+                # work around for https://github.com/python/cpython/issues/110309
+                spec = [
+                    v
+                    for v in node.format_spec.values
+                    if not (isinstance(v, ast.Constant) and v.value == "")
+                ]
+                if len(spec) == 1 and self.try_only(node, spec[0]):
+                    coverage_required()
+                    self.minimize(spec[0])
+                    return
+
+            if not self.try_none(node.format_spec):
+                self.minimize(node.format_spec)
+
+            self.minimize_expr(node.value)
+
+        elif isinstance(node, ast.TemplateStr):
+            for v in node.values:
+                if isinstance(v, ast.Interpolation) and self.try_only(node, v.value):
+                    self.minimize(v.value)
+                    return
+                if (
+                    isinstance(v, ast.Interpolation)
+                    and v.format_spec
+                    and self.try_only(node, v.format_spec)
+                ):
+                    self.minimize(v.format_spec)
+                    return
+
+            self.minimize(node.values)
+            # todo minimize values
+
         else:
             assert False, "expression is not handled %s" % (node)
 

tests/remove_children_samples/4bea02ccb1074ed770057000cf75f5b40550b4becfd595e90e21f607100c618b.py

@@ -0,0 +1,2 @@
+for 0[0] in 0:
+    pass

tests/remove_children_samples/c913a59a699ab99c3cfc1d4d619b33cc487d47a9442988b6baf5e6ea0a801f16.py

@@ -0,0 +1 @@
+0[0]: 0

tests/remove_one_samples/0d30bc582aa2011e78ae27ad9f93d2f2d963ae127b921c99b27f2a121e0138ed.py

@@ -0,0 +1 @@
+t'{name_4!s}'

tests/test_cli.py

@@ -53,7 +53,7 @@ def minimize_files(
             print("\n".join(format_tb(result.exc_info[2])))
             print(result.exception)
 
-        output = re.sub("'/.*python", "'python", result.output)
+        output = re.sub("'/.*python3?", "'python", result.output)
 
         assert output == expected_output
 
@@ -192,7 +192,7 @@ def test_no_track():
         expected_output=snapshot(
             """\
 I don't know what you want to minimize for.
-'bbbb' is not a string which in the stdout/stderr of 'python3 bug.py'
+'bbbb' is not a string which in the stdout/stderr of 'python bug.py'
 """
         ),
         expected_files=snapshot("<unchanged>"),

tests/test_remove_children.py

@@ -22,10 +22,30 @@
 sample_dir.mkdir(exist_ok=True)
 
 
+def is_trivial_node(node):
+    """
+    trivial nodes are:
+    * nodes without ast-nodes as children or
+    * none nodes at all
+    """
+    if not isinstance(node, (ast.expr, ast.stmt)):
+        return True
+    return (
+        sum(isinstance(n, (ast.expr, ast.stmt)) for n in ast.iter_child_nodes(node))
+        == 0
+    )
+
+
+# EXCEPTIONS = {ast.AnnAssign: {"target": ast.Subscript}}
+EXCEPTIONS = {}
+
+
 def is_simple_node(node: Optional[ast.AST]):
     if node is None:
         return True
 
+    assert not isinstance(node, list)
+
     if sys.version_info >= (3, 10):
         if (
             isinstance(node, ast.Match)
@@ -41,12 +61,14 @@ def is_simple_node(node: Optional[ast.AST]):
             return True
 
     for name, field in ast.iter_fields(node):
-        if (
-            isinstance(field, (ast.expr, ast.stmt))
-            and len([n for n in ast.walk(field) if isinstance(n, (ast.expr, ast.stmt))])
-            > 1
-        ):
-            return False
+        exceptions = EXCEPTIONS.get(type(node), [])
+        if name in exceptions and isinstance(field, exceptions[name]):
+            if not is_simple_node(field):
+                return False
+        else:
+            if not is_trivial_node(field):
+                return False
+
     return True
 
 

tests/test_remove_one.py

@@ -88,6 +88,13 @@ def weight(node):
             # work around for https://github.com/python/cpython/issues/110309
             result = -(sum(isinstance(n, ast.Constant) for n in node.values))
 
+        if sys.version_info >= (3, 14):
+            if isinstance(node, ast.Interpolation):
+                result = 0
+            if isinstance(node, ast.TemplateStr):
+                # work around for https://github.com/python/cpython/issues/110309
+                result = -(sum(isinstance(n, ast.Constant) for n in node.values))
+
         if isinstance(node, ast.IfExp):
             result = -1
         if isinstance(node, ast.Subscript):