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

Merge branch 'python-3.3-to-3.5' into python-2.4

Browse Source
This commit is contained in:
rocky
2021-10-23 09:52:40 -04:00
parent 8a9a4ca6cc 5ddbea73f4
commit dce7e809e2
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin-tools/setup-master.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash
PYTHON_VERSION=3.7.7
PYTHON_VERSION=3.7.12
# FIXME put some of the below in a common routine
function finish {

2
admin-tools/setup-python-2.4.sh
View File

@@ -11,7 +11,7 @@ mydir=$(dirname $bs)
fulldir=$(readlink -f $mydir)
cd $fulldir/..
(cd ../python-spark && git checkout python-2.4 && pyenv local $PYTHON_VERSION) && git pull && \
(cd ../python-xdis && . ./admint-tools/setup-python-2.4.sh) && \
(cd ../python-xdis && . ./admin-tools/setup-python-2.4.sh) && \
git checkout python-2.4 && pyenv local $PYTHON_VERSION && git pull
cd $owd
rm -v */.python-version || true

28
uncompyle6/semantics/fragments.py
View File

@@ -600,7 +600,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
def n_mkfunc(self, node):
start = len(self.f.getvalue())
if self.version >= 3.3 or node[-2] == "kwargs":
if self.version >= (3, 3) or node[-2] == "kwargs":
# LOAD_CONST code object ..
# LOAD_CONST 'x0' if >= 3.3
# MAKE_FUNCTION ..
@@ -659,9 +659,9 @@ class FragmentsWalker(pysource.SourceWalker, object):
self.prec = 27
# FIXME: clean this up
if self.version > 3.0 and node == "dict_comp":
if self.version >= (3, 1) and node == "dict_comp":
cn = node[1]
elif self.version > 3.0 and node in ("generator_exp", "generator_exp_async"):
elif self.version > (3, 1) and node in ("generator_exp", "generator_exp_async"):
if node[0] == "load_genexpr":
load_genexpr = node[0]
elif node[1] == "load_genexpr":
@@ -929,7 +929,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
def n_generator_exp(self, node):
start = len(self.f.getvalue())
self.write('(')
if self.version > (3, 2):
if self.version >= (3, 3):
code_index = -6
else:
code_index = -5
@@ -1068,7 +1068,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
# class definition ('class X(A,B,C):')
cclass = self.currentclass
if self.version > 3.0:
if self.version >= (3, 1):
if node == "classdefdeco2":
currentclass = node[1][2].pattr
buildclass = node
@@ -1138,7 +1138,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
start = len(self.f.getvalue())
self.write(self.indent, "class ", self.currentclass)
if self.version > 3.0:
if self.version >= (3, 1):
self.print_super_classes3(subclass_info)
else:
self.print_super_classes(build_list)
@@ -1530,6 +1530,12 @@ class FragmentsWalker(pysource.SourceWalker, object):
sep = ""
i += 1
self.write("(")
if kwargs:
# Last arg is tuple of keyword values: omit
l = n - 1
else:
l = n
if kwargs:
# 3.6+ does this
while j < i:
@@ -1556,7 +1562,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
pass
pass
else:
if self.version >= 3.6 and node[0] == "LOAD_CONST":
if self.version >= (3, 6) and node[0] == "LOAD_CONST":
return
value = self.traverse(node[0])
self.write("(")
@@ -1582,7 +1588,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
self.write("{")
self.set_pos_info(node[0], start, start + 1)
if self.version >= 3.0 and not self.is_pypy:
if self.version >= (3, 0) and not self.is_pypy:
if node[0].kind.startswith("kvlist"):
# Python 3.5+ style key/value list in dict
kv_node = node[0]
@@ -1654,14 +1660,14 @@ class FragmentsWalker(pysource.SourceWalker, object):
self.write(sep[1:])
pass
elif node[0].kind.startswith("dict_entry"):
assert self.version >= 3.5
assert self.version >= (3, 5)
template = ("%C", (0, len(node[0]), ", **"))
self.template_engine(template, node[0])
sep = ""
elif node[-1].kind.startswith("BUILD_MAP_UNPACK") or node[
-1
].kind.startswith("dict_entry"):
assert self.version >= 3.5
assert self.version >= (3, 5)
# FIXME: I think we can intermingle dict_comp's with other
# dictionary kinds of things. The most common though is
# a sequence of dict_comp's
@@ -1685,7 +1691,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
else:
sep = ""
opname = node[-1].kind
if self.is_pypy and self.version >= 3.5:
if self.is_pypy and self.version >= (3, 5):
if opname.startswith("BUILD_CONST_KEY_MAP"):
keys = node[-2].attr
# FIXME: DRY this and the above