From 214c9f0e330cd06fb92ffc6e4c7f7c3af981504c Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sun, 12 Jul 2020 18:41:11 +0200 Subject: dev-python/astunparse: Remove redundant versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/astunparse/Manifest | 1 - dev-python/astunparse/astunparse-1.6.2.ebuild | 33 --- .../astunparse/files/astunparse-1.6.2-py38.patch | 259 --------------------- 3 files changed, 293 deletions(-) delete mode 100644 dev-python/astunparse/astunparse-1.6.2.ebuild delete mode 100644 dev-python/astunparse/files/astunparse-1.6.2-py38.patch (limited to 'dev-python') diff --git a/dev-python/astunparse/Manifest b/dev-python/astunparse/Manifest index 2d28afb76e9f..82d2f7d59c40 100644 --- a/dev-python/astunparse/Manifest +++ b/dev-python/astunparse/Manifest @@ -1,2 +1 @@ -DIST astunparse-1.6.2.tar.gz 16339 BLAKE2B d35d63b8313718c1d873d55b7da824465be9b4bc9e486ff82dac7db2df5185f8a59bfb283844d7108927b04ee02879fe921c87f9da8bd87c157341e6022b40cc SHA512 1e344354481dab7345d8790791e15e2ce733b8985839972a1771b97adebbfc2b42c8fb258ea36f245baed553d3b8e5007872d6559ebcc5ef1eb6f6c6a5d66c81 DIST astunparse-1.6.3.tar.gz 18290 BLAKE2B d7e6fa3ba58c6e112eb84720832890f4515b1c4ed420587565cdff37da893c07eefd0b9eb00795a3eb08bf56834d65150298a6be65e524b0c267c38e6f9c20d1 SHA512 12e99b32524e551494d3053a57aeb646bca8a96a9aa17b0737e6dace6c11874e2e7633d82197cacc0b55622bea637030344ab45c8db57ef244bd63663799d2e9 diff --git a/dev-python/astunparse/astunparse-1.6.2.ebuild b/dev-python/astunparse/astunparse-1.6.2.ebuild deleted file mode 100644 index f57695d4f84c..000000000000 --- a/dev-python/astunparse/astunparse-1.6.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit distutils-r1 - -DESCRIPTION="Astun parser for python" -HOMEPAGE="https://github.com/simonpercivall/astunparse" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - >=dev-python/six-1.6.1[${PYTHON_USEDEP}] - >=dev-python/wheel-0.23.0[${PYTHON_USEDEP}] -" -PATCHES=( - "${FILESDIR}/astunparse-1.6.2-tests.patch" - - # https://github.com/simonpercivall/astunparse/commit/2bd946919076f993cee1173611914372a0a25f00 - "${FILESDIR}/astunparse-1.6.2-py38.patch" -) - -distutils_enable_tests setup.py - -python_install_all() { - distutils-r1_python_install_all - dodoc *.rst -} diff --git a/dev-python/astunparse/files/astunparse-1.6.2-py38.patch b/dev-python/astunparse/files/astunparse-1.6.2-py38.patch deleted file mode 100644 index aa27112393c0..000000000000 --- a/dev-python/astunparse/files/astunparse-1.6.2-py38.patch +++ /dev/null @@ -1,259 +0,0 @@ -diff --git a/lib/astunparse/unparser.py b/lib/astunparse/unparser.py -index edf8c68..0ef6fd8 100644 ---- a/lib/astunparse/unparser.py -+++ b/lib/astunparse/unparser.py -@@ -29,7 +29,7 @@ class Unparser: - output source code for the abstract syntax; original formatting - is disregarded. """ - -- def __init__(self, tree, file=sys.stdout): -+ def __init__(self, tree, file = sys.stdout): - """Unparser(tree, file=sys.stdout) -> None. - Print the source for tree to file.""" - self.f = file -@@ -89,6 +89,13 @@ class Unparser: - self.fill() - self.dispatch(tree.value) - -+ def _NamedExpr(self, tree): -+ self.write("(") -+ self.dispatch(tree.target) -+ self.write(" := ") -+ self.dispatch(tree.value) -+ self.write(")") -+ - def _Import(self, t): - self.fill("import ") - interleave(lambda: self.write(", "), self.dispatch, t.names) -@@ -120,11 +127,11 @@ class Unparser: - - def _AnnAssign(self, t): - self.fill() -- if not t.simple: -- self.write("(") -+ if not t.simple and isinstance(t.target, ast.Name): -+ self.write('(') - self.dispatch(t.target) -- if not t.simple: -- self.write(")") -+ if not t.simple and isinstance(t.target, ast.Name): -+ self.write(')') - self.write(": ") - self.dispatch(t.annotation) - if t.value: -@@ -189,6 +196,14 @@ class Unparser: - self.fill("nonlocal ") - interleave(lambda: self.write(", "), self.write, t.names) - -+ def _Await(self, t): -+ self.write("(") -+ self.write("await") -+ if t.value: -+ self.write(" ") -+ self.dispatch(t.value) -+ self.write(")") -+ - def _Yield(self, t): - self.write("(") - self.write("yield") -@@ -328,12 +343,19 @@ class Unparser: - self.dispatch(t.body) - self.leave() - -- def _generic_FunctionDef(self, t, async_=False): -+ def _FunctionDef(self, t): -+ self.__FunctionDef_helper(t, "def") -+ -+ def _AsyncFunctionDef(self, t): -+ self.__FunctionDef_helper(t, "async def") -+ -+ def __FunctionDef_helper(self, t, fill_suffix): - self.write("\n") - for deco in t.decorator_list: - self.fill("@") - self.dispatch(deco) -- self.fill(("async " if async_ else "") + "def " + t.name + "(") -+ def_str = fill_suffix+" "+t.name + "(" -+ self.fill(def_str) - self.dispatch(t.args) - self.write(")") - if getattr(t, "returns", False): -@@ -343,14 +365,14 @@ class Unparser: - self.dispatch(t.body) - self.leave() - -- def _FunctionDef(self, t): -- self._generic_FunctionDef(t) -+ def _For(self, t): -+ self.__For_helper("for ", t) - -- def _AsyncFunctionDef(self, t): -- self._generic_FunctionDef(t, async_=True) -+ def _AsyncFor(self, t): -+ self.__For_helper("async for ", t) - -- def _generic_For(self, t, async_=False): -- self.fill("async for " if async_ else "for ") -+ def __For_helper(self, fill, t): -+ self.fill(fill) - self.dispatch(t.target) - self.write(" in ") - self.dispatch(t.iter) -@@ -363,12 +385,6 @@ class Unparser: - self.dispatch(t.orelse) - self.leave() - -- def _For(self, t): -- self._generic_For(t) -- -- def _AsyncFor(self, t): -- self._generic_For(t, async_=True) -- - def _If(self, t): - self.fill("if ") - self.dispatch(t.test) -@@ -586,8 +604,9 @@ class Unparser: - - def _comprehension(self, t): - if getattr(t, 'is_async', False): -- self.write(" async") -- self.write(" for ") -+ self.write(" async for ") -+ else: -+ self.write(" for ") - self.dispatch(t.target) - self.write(" in ") - self.dispatch(t.iter) -@@ -612,26 +631,27 @@ class Unparser: - - def _Dict(self, t): - self.write("{") -- def write_pair(pair): -- (k, v) = pair -+ def write_key_value_pair(k, v): -+ self.dispatch(k) -+ self.write(": ") -+ self.dispatch(v) -+ -+ def write_item(item): -+ k, v = item - if k is None: -- self.write('**') -+ # for dictionary unpacking operator in dicts {**{'y': 2}} -+ # see PEP 448 for details -+ self.write("**") - self.dispatch(v) - else: -- self.dispatch(k) -- self.write(": ") -- self.dispatch(v) -- self.write(",") -- self._indent +=1 -- self.fill("") -- interleave(lambda: self.fill(""), write_pair, zip(t.keys, t.values)) -- self._indent -=1 -- self.fill("}") -+ write_key_value_pair(k, v) -+ interleave(lambda: self.write(", "), write_item, zip(t.keys, t.values)) -+ self.write("}") - - def _Tuple(self, t): - self.write("(") - if len(t.elts) == 1: -- (elt,) = t.elts -+ elt = t.elts[0] - self.dispatch(elt) - self.write(",") - else: -@@ -656,10 +676,9 @@ class Unparser: - self.dispatch(t.operand) - self.write(")") - -- binop = { "Add":"+", "Sub":"-", "Mult":"*", "Div":"/", "Mod":"%", -+ binop = { "Add":"+", "Sub":"-", "Mult":"*", "MatMult":"@", "Div":"/", "Mod":"%", - "LShift":"<<", "RShift":">>", "BitOr":"|", "BitXor":"^", "BitAnd":"&", -- "FloorDiv":"//", "Pow": "**", -- "MatMult":"@"} -+ "FloorDiv":"//", "Pow": "**"} - def _BinOp(self, t): - self.write("(") - self.dispatch(t.left) -@@ -689,7 +708,7 @@ class Unparser: - # Special case: 3.__abs__() is a syntax error, so if t.value - # is an integer literal then we need to either parenthesize - # it or add an extra space to get 3 .__abs__(). -- if isinstance(t.value, ast.Num) and isinstance(t.value.n, int): -+ if isinstance(t.value, getattr(ast, 'Constant', getattr(ast, 'Num', None))) and isinstance(t.value.n, int): - self.write(" ") - self.write(".") - self.write(t.attr) -@@ -760,18 +779,22 @@ class Unparser: - def _arguments(self, t): - first = True - # normal arguments -- defaults = [None] * (len(t.args) - len(t.defaults)) + t.defaults -- for a,d in zip(t.args, defaults): -+ all_args = getattr(t, 'posonlyargs', []) + t.args -+ defaults = [None] * (len(all_args) - len(t.defaults)) + t.defaults -+ for index, elements in enumerate(zip(all_args, defaults), 1): -+ a, d = elements - if first:first = False - else: self.write(", ") - self.dispatch(a) - if d: - self.write("=") - self.dispatch(d) -+ if index == len(getattr(t, 'posonlyargs', ())): -+ self.write(", /") - - # varargs, or bare '*' if no varargs but keyword-only arguments present - if t.vararg or getattr(t, "kwonlyargs", False): -- if first: first = False -+ if first:first = False - else: self.write(", ") - self.write("*") - if t.vararg: -@@ -839,14 +862,6 @@ class Unparser: - self.write(" as ") - self.dispatch(t.optional_vars) - -- def _Await(self, t): -- self.write("(") -- self.write("await") -- if t.value: -- self.write(" ") -- self.dispatch(t.value) -- self.write(")") -- - def roundtrip(filename, output=sys.stdout): - if six.PY3: - with open(filename, "rb") as pyfile: -diff --git a/setup.py b/setup.py -index 6f62fd9..e5a277a 100755 ---- a/setup.py -+++ b/setup.py -@@ -48,11 +48,10 @@ setup( - "Programming Language :: Python :: 2", - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', -- 'Programming Language :: Python :: 3.3', -- 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', -+ 'Programming Language :: Python :: 3.8', - 'Topic :: Software Development :: Code Generators', - ], - test_suite='tests', -diff --git a/tests/common.py b/tests/common.py -index c8db903..95b9755 100644 ---- a/tests/common.py -+++ b/tests/common.py -@@ -215,6 +215,7 @@ class AstunparseCommonTestCase: - self.check_roundtrip("not True or False") - self.check_roundtrip("True or not False") - -+ @unittest.skipUnless(sys.version_info < (3, 6), "Only works for Python < 3.6") - def test_integer_parens(self): - self.check_roundtrip("3 .__abs__()") - -- cgit v1.2.3-65-gdbad