jinx/python-uncompyle6
1
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2025-08-04 09:22:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'python-3.0-to-3.2' into python-2.4

Browse Source
This commit is contained in:
rocky
2023-06-30 16:20:42 -04:00
parent aae7777d92 47f0d5cd69
commit 69823fbff4
7 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
uncompyle6/semantics/n_actions.py
View File

@@ -146,7 +146,6 @@ class NonterminalActions:
self.prune() # stop recursing
def n_classdef(self, node):
if self.version >= (3, 6):
self.n_classdef36(node)
elif self.version >= (3, 0):
@@ -521,7 +520,6 @@ class NonterminalActions:
self.prune()
def n_docstring(self, node):
indent = self.indent
doc_node = node[0]
if doc_node.attr:
@@ -543,7 +541,7 @@ class NonterminalActions:
self.write(indent)
docstring = repr(docstring.expandtabs())[1:-1]
for (orig, replace) in (
for orig, replace in (
("\\\\", "\t"),
("\\r\\n", "\n"),
("\\n", "\n"),
@@ -701,8 +699,11 @@ class NonterminalActions:
self.write("(")
iter_index = 3
if self.version > (3, 2):
if self.version >= (3, 6):
if node[0].kind in ("load_closure", "load_genexpr") and self.version >= (3, 8):
if self.version >= (3, 4):
if node[0].kind in (
"load_closure",
"load_genexpr",
) and self.version >= (3, 8):
code_index = -6
is_lambda = self.is_lambda
if node[0].kind == "load_genexpr":
@@ -710,12 +711,13 @@ class NonterminalActions:
self.closure_walk(node, collection_index=4)
self.is_lambda = is_lambda
else:
# Python 3.7+ adds optional "come_froms" at node[0] so count from the end
# Python 3.7+ adds optional "come_froms" at node[0] so count from
# the end.
if node == "generator_exp_async" and self.version[:2] == (3, 6):
code_index = 0
else:
code_index = -6
if self.version < (3, 8):
if self.version < (3, 8) and not isinstance(node[4], Token):
iter_index = 4
else:
iter_index = 3
@@ -1031,7 +1033,6 @@ class NonterminalActions:
self.prune()
def n_mkfunc(self, node):
code_node = find_code_node(node, -2)
code = code_node.attr
self.write(code.co_name)
@@ -1079,7 +1080,10 @@ class NonterminalActions:
else:
# We can't comment out like above because there may be a trailing ')'
# that needs to be written
assert len(node) == 3 and node[2] in ("RETURN_VALUE_LAMBDA", "LAMBDA_MARKER")
assert len(node) == 3 and node[2] in (
"RETURN_VALUE_LAMBDA",
"LAMBDA_MARKER",
)
self.preorder(node[0])
self.prune()