SLFO-pool/python-astunparse
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main python-astunparse revision fdb2efe0d9fb5e066d929ecbbbb39250

Browse Source
This commit is contained in:
Adrian Schröter
2025-03-28 16:35:23 +01:00
parent fce925e02b
commit d238db0bb0
3 changed files with 245 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

229
parentheses.patch Normal file
View File

@@ -0,0 +1,229 @@
From 8f3af04c64c39b13f65c58a14f09433661d63a79 Mon Sep 17 00:00:00 2001
From: eff-kay <faizan10114@gmail.com>
Date: Fri, 18 Aug 2023 19:39:00 -0400
Subject: [PATCH] fix extra parenthsis addition
---
lib/astunparse/unparser.py | 66 +++++++++++++++++++++++++++-----------
test_requirements.txt | 2 ++
tests/common.py | 3 +-
tests/test_dump.py | 22 ++++++-------
tests/test_unparse.py | 14 +++++++-
tox.ini | 2 +-
6 files changed, 76 insertions(+), 33 deletions(-)
Index: astunparse-1.6.3/lib/astunparse/unparser.py
===================================================================
--- astunparse-1.6.3.orig/lib/astunparse/unparser.py
+++ astunparse-1.6.3/lib/astunparse/unparser.py
@@ -56,14 +56,17 @@ class Unparser:
"Decrease the indentation level."
self._indent -= 1
- def dispatch(self, tree):
+ def dispatch(self, tree, parent_t=None):
"Dispatcher function, dispatching tree type T to method _T."
if isinstance(tree, list):
for t in tree:
self.dispatch(t)
return
meth = getattr(self, "_"+tree.__class__.__name__)
- meth(tree)
+ if parent_t:
+ meth(tree, parent_t=parent_t)
+ else:
+ meth(tree)
############### Unparsing methods ######################
@@ -517,7 +520,8 @@ class Unparser:
meth(t.format_spec, write)
write("}")
- def _Name(self, t):
+ def _Name(self, t, parent_t=None):
+
self.write(t.id)
def _NameConstant(self, t):
@@ -535,7 +539,7 @@ class Unparser:
else:
self.write(repr(value))
- def _Constant(self, t):
+ def _Constant(self, t, parent_t=None):
value = t.value
if isinstance(value, tuple):
self.write("(")
@@ -659,8 +663,12 @@ class Unparser:
self.write(")")
unop = {"Invert":"~", "Not": "not", "UAdd":"+", "USub":"-"}
- def _UnaryOp(self, t):
- self.write("(")
+ def _UnaryOp(self, t, parent_t=None):
+ if isinstance(parent_t, ast.Call):
+ pass
+ else:
+ self.write("(")
+
self.write(self.unop[t.op.__class__.__name__])
self.write(" ")
if six.PY2 and isinstance(t.op, ast.USub) and isinstance(t.operand, ast.Num):
@@ -674,34 +682,57 @@ class Unparser:
self.write(")")
else:
self.dispatch(t.operand)
- self.write(")")
+
+ if isinstance(parent_t, ast.Call):
+ pass
+ else:
+ self.write(")")
binop = { "Add":"+", "Sub":"-", "Mult":"*", "MatMult":"@", "Div":"/", "Mod":"%",
"LShift":"<<", "RShift":">>", "BitOr":"|", "BitXor":"^", "BitAnd":"&",
"FloorDiv":"//", "Pow": "**"}
- def _BinOp(self, t):
- self.write("(")
+ def _BinOp(self, t, parent_t=None):
+ if isinstance(parent_t, ast.Call):
+ pass
+ else:
+ self.write("(")
self.dispatch(t.left)
self.write(" " + self.binop[t.op.__class__.__name__] + " ")
self.dispatch(t.right)
- self.write(")")
+ if isinstance(parent_t, ast.Call):
+ pass
+ else:
+ self.write(")")
cmpops = {"Eq":"==", "NotEq":"!=", "Lt":"<", "LtE":"<=", "Gt":">", "GtE":">=",
"Is":"is", "IsNot":"is not", "In":"in", "NotIn":"not in"}
- def _Compare(self, t):
- self.write("(")
+ def _Compare(self, t, parent_t=None):
+ if isinstance(parent_t, ast.Call):
+ pass
+ else:
+ self.write("(")
self.dispatch(t.left)
for o, e in zip(t.ops, t.comparators):
self.write(" " + self.cmpops[o.__class__.__name__] + " ")
self.dispatch(e)
- self.write(")")
+ if isinstance(parent_t, ast.Call):
+ pass
+ else:
+ self.write(")")
boolops = {ast.And: 'and', ast.Or: 'or'}
- def _BoolOp(self, t):
- self.write("(")
+ def _BoolOp(self, t, parent_t=None):
+ if isinstance(parent_t, ast.Call):
+ pass
+ else:
+ self.write("(")
+
s = " %s " % self.boolops[t.op.__class__]
interleave(lambda: self.write(s), self.dispatch, t.values)
- self.write(")")
+ if isinstance(parent_t, ast.Call):
+ pass
+ else:
+ self.write(")")
def _Attribute(self,t):
self.dispatch(t.value)
@@ -720,22 +751,22 @@ class Unparser:
for e in t.args:
if comma: self.write(", ")
else: comma = True
- self.dispatch(e)
+ self.dispatch(e, parent_t=t)
for e in t.keywords:
if comma: self.write(", ")
else: comma = True
- self.dispatch(e)
+ self.dispatch(e, parent_t=t)
if sys.version_info[:2] < (3, 5):
if t.starargs:
if comma: self.write(", ")
else: comma = True
self.write("*")
- self.dispatch(t.starargs)
+ self.dispatch(t.starargs, parent_t=t)
if t.kwargs:
if comma: self.write(", ")
else: comma = True
self.write("**")
- self.dispatch(t.kwargs)
+ self.dispatch(t.kwargs, parent_t=t)
self.write(")")
def _Subscript(self, t):
Index: astunparse-1.6.3/test_requirements.txt
===================================================================
--- astunparse-1.6.3.orig/test_requirements.txt
+++ astunparse-1.6.3/test_requirements.txt
@@ -1,2 +1,4 @@
coverage == 3.7.1
+flake8
+tox
-rrequirements.txt
Index: astunparse-1.6.3/tests/common.py
===================================================================
--- astunparse-1.6.3.orig/tests/common.py
+++ astunparse-1.6.3/tests/common.py
@@ -262,7 +262,6 @@ class AstunparseCommonTestCase:
self.check_roundtrip("a is b is c is not d")
def test_function_arguments(self):
- self.check_roundtrip("def f(): pass")
self.check_roundtrip("def f(a): pass")
self.check_roundtrip("def f(b = 2): pass")
self.check_roundtrip("def f(a, b): pass")
@@ -394,7 +393,7 @@ class AstunparseCommonTestCase:
self.check_roundtrip("a: int = None")
self.check_roundtrip("some_list: List[int]")
self.check_roundtrip("some_list: List[int] = []")
- self.check_roundtrip("t: Tuple[int, ...] = (1, 2, 3)")
+ self.check_roundtrip("t: Tuple[(int, ...)] = (1, 2, 3)")
self.check_roundtrip("(a): int")
self.check_roundtrip("(a): int = 0")
self.check_roundtrip("(a): int = None")
Index: astunparse-1.6.3/tests/test_dump.py
===================================================================
--- astunparse-1.6.3.orig/tests/test_dump.py
+++ astunparse-1.6.3/tests/test_dump.py
@@ -9,16 +9,16 @@ else:
import astunparse
from tests.common import AstunparseCommonTestCase
-class DumpTestCase(AstunparseCommonTestCase, unittest.TestCase):
+# class DumpTestCase(AstunparseCommonTestCase, unittest.TestCase):
- def assertASTEqual(self, dump1, dump2):
- # undo the pretty-printing
- dump1 = re.sub(r"(?<=[\(\[])\n\s+", "", dump1)
- dump1 = re.sub(r"\n\s+", " ", dump1)
- self.assertEqual(dump1, dump2)
+# def assertASTEqual(self, dump1, dump2):
+# # undo the pretty-printing
+# dump1 = re.sub(r"(?<=[\(\[])\n\s+", "", dump1)
+# dump1 = re.sub(r"\n\s+", " ", dump1)
+# self.assertEqual(dump1, dump2)
- def check_roundtrip(self, code1, filename="internal", mode="exec"):
- ast_ = compile(str(code1), filename, mode, ast.PyCF_ONLY_AST)
- dump1 = astunparse.dump(ast_)
- dump2 = ast.dump(ast_)
- self.assertASTEqual(dump1, dump2)
+# def check_roundtrip(self, code1, filename="internal", mode="exec"):
+# ast_ = compile(str(code1), filename, mode, ast.PyCF_ONLY_AST)
+# dump1 = astunparse.dump(ast_)
+# dump2 = ast.dump(ast_)
+# self.assertASTEqual(dump1, dump2)

14
python-astunparse.changes
View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Dec 2 15:15:22 UTC 2024 - Markéta Machová <mmachova@suse.com>
- Add patch parentheses.patch to fix tests on Python 3.13
-------------------------------------------------------------------
Thu Nov 21 10:08:41 UTC 2024 - Dirk Müller <dmueller@suse.com>
- skip for python 3.13
-------------------------------------------------------------------
Fri Oct 20 19:42:26 UTC 2023 - Matej Cepl <mcepl@cepl.eu>
@@ -16,7 +26,7 @@ Thu Apr 13 22:40:05 UTC 2023 - Matej Cepl <mcepl@suse.com>
-------------------------------------------------------------------
Fri Feb 17 10:59:59 UTC 2023 - Dirk Müller <dmueller@suse.com>
- need to turn off noarch to be able to skip tests on 32bit arches
- need to turn off noarch to be able to skip tests on 32bit arches
-------------------------------------------------------------------
Thu Feb 16 22:39:53 UTC 2023 - Dirk Müller <dmueller@suse.com>
@@ -33,7 +43,7 @@ Fri Sep 10 05:23:39 UTC 2021 - pgajdos@suse.com
Sun Apr 18 12:03:07 UTC 2021 - Ben Greiner <code@bnavigator.de>
- Add astunparse-pr57-py39.patch by Fedora maintainer for Python
3.9 support -- gh#simonpercivall/astunparse#57
3.9 support -- gh#simonpercivall/astunparse#57
-------------------------------------------------------------------
Fri Jan 17 15:36:43 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>

5
python-astunparse.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package python-astunparse
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,6 +29,9 @@ Source: https://files.pythonhosted.org/packages/source/a/astunparse/astu
Patch0: astunparse-pr57-py39.patch
# https://github.com/simonpercivall/astunparse/pull/59
Patch1: fix-formatted-value.patch
# https://github.com/simonpercivall/astunparse/pull/70
# it is a bit overpowered, but it fixes the issue
Patch2: parentheses.patch
BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module six >= 1.6.1}