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 'master' into python-2.4

Browse Source
This commit is contained in:
rocky
2020-07-25 13:34:59 -04:00
parent c105edff47 844144f90a
commit 730b739907
9 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
NEWS.md
View File

@@ -1,3 +1,15 @@
3.7.3: 2020-7-25
================
Mostly small miscellaneous bug fixes
* `__doc__ = DocDescr()` from `test_descr.py` was getting confused as a docstring.
* detect 2.7 exchandler range better
* Add for .. else reduction checks on 2.6 and before
* Add reduce check for 2.7 augmented assign
* Add VERSION in a pydoc-friendly way
3.7.2: 2020-6-27 3.7.2: 2020-6-27
================ ================

0
admin-tools/check-newer-versions.sh Normal file → Executable file
View File

0
admin-tools/check-older-versions.sh Normal file → Executable file
View File

12
admin-tools/how-to-make-a-release.md
View File

@@ -39,7 +39,7 @@
# Make sure pyenv is running and check newer versions # Make sure pyenv is running and check newer versions
$ pyenv local && source admin-tools/check-newer-versions.sh $ admin-tools/check-newer-versions.sh
# Switch to python-2.4, sync that up and build that first since it creates a tarball which we don't want. # Switch to python-2.4, sync that up and build that first since it creates a tarball which we don't want.
@@ -50,19 +50,19 @@
# Check against older versions # Check against older versions
$ source admin-tools/check-older-versions.sh $ admin-tools/check-older-versions.sh
# Make packages and tag # Make packages and tag
$ . ./admin-tools/make-dist-older.sh $ . ./admin-tools/make-dist-older.sh
$ pyenv local 3.8.3 $ pyenv local 3.8.4
$ twine check dist/uncompyle6-$VERSION*
$ ./admin-tools/make-dist-newer.sh
$ twine check dist/uncompyle6-$VERSION* $ twine check dist/uncompyle6-$VERSION*
$ git tag release-python-2.4-$VERSION
$ . ./admin-tools/make-dist-newer.sh
# Check package on github # Check package on github
$ mkdir /tmp/gittest; pushd /tmp/gittest $ [[ ! -d /tmp/gittest ]] && mkdir /tmp/gittest; pushd /tmp/gittest
$ pyenv local 3.7.5 $ pyenv local 3.7.5
$ pip install -e git://github.com/rocky/python-uncompyle6.git#egg=uncompyle6 $ pip install -e git://github.com/rocky/python-uncompyle6.git#egg=uncompyle6
$ uncompyle6 --help $ uncompyle6 --help

2
admin-tools/pyenv-newer-versions
View File

@@ -5,4 +5,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
echo "This script should be *sourced* rather than run directly through bash" echo "This script should be *sourced* rather than run directly through bash"
exit 1 exit 1
fi fi
export PYVERSIONS='3.5.9 3.6.10 2.6.9 3.3.7 2.7.18 3.2.6 3.1.5 3.4.10 3.7.7 3.8.3' export PYVERSIONS='3.5.9 3.6.10 2.6.9 3.3.7 2.7.18 3.2.6 3.1.5 3.4.10 3.7.7 3.8.4'

15
uncompyle6/__init__.py
View File

@@ -28,20 +28,25 @@
import sys import sys
__docformat__ = 'restructuredtext' __docformat__ = "restructuredtext"
PYTHON3 = (sys.version_info >= (3, 0)) from uncompyle6.version import VERSION
# This ensures VERSION will appear in pydoc
__version__ = VERSION
PYTHON3 = sys.version_info >= (3, 0)
# We do this crazy way to support Python 2.6 which # We do this crazy way to support Python 2.6 which
# doesn't support version_major, and has a bug in # doesn't support version_major, and has a bug in
# floating point so we can't divide 26 by 10 and get # floating point so we can't divide 26 by 10 and get
# 2.6 # 2.6
PYTHON_VERSION = sys.version_info[0] + (sys.version_info[1] / 10.0) PYTHON_VERSION = sys.version_info[0] + (sys.version_info[1] / 10.0)
PYTHON_VERSION_STR = "%s.%s" % (sys.version_info[0], sys.version_info[1]) PYTHON_VERSION_STR = "%s.%s" % (sys.version_info[0], sys.version_info[1])
IS_PYPY = '__pypy__' in sys.builtin_module_names IS_PYPY = "__pypy__" in sys.builtin_module_names
if hasattr(sys, 'setrecursionlimit'): if hasattr(sys, "setrecursionlimit"):
# pyston doesn't have setrecursionlimit # pyston doesn't have setrecursionlimit
sys.setrecursionlimit(5000) sys.setrecursionlimit(5000)

4
uncompyle6/parsers/reducecheck/except_handler.py
View File

@@ -2,13 +2,15 @@
def except_handler(self, lhs, n, rule, ast, tokens, first, last): def except_handler(self, lhs, n, rule, ast, tokens, first, last):
end_token = tokens[last-1] end_token = tokens[last-1]
# print("XXX", first, last)
# for t in range(first, last): # for t in range(first, last):
# print(tokens[t]) # print(tokens[t])
# print("=" * 30) # print("=" * 30)
# FIXME: Figure out why this doesn't work on # FIXME: Figure out why this doesn't work on
# bytecode-1.4/anydbm.pyc # bytecode-1.4/anydbm.pyc
if self.version != 1.4: if self.version == 1.4:
return False return False
# Make sure come froms all come from within "except_handler". # Make sure come froms all come from within "except_handler".

4
uncompyle6/semantics/pysource.py
View File

@@ -587,8 +587,7 @@ class SourceWalker(GenericASTTraversal, object):
if n == "LOAD_CONST" and repr(n.pattr)[0] == "-": if n == "LOAD_CONST" and repr(n.pattr)[0] == "-":
self.prec = 6 self.prec = 6
# print(n.kind, p, "<", self.prec) # print("XXX", n.kind, p, "<", self.prec)
# print(self.f.getvalue())
if p < self.prec: if p < self.prec:
self.write("(") self.write("(")
@@ -604,7 +603,6 @@ class SourceWalker(GenericASTTraversal, object):
# If expr is yield we want parens. # If expr is yield we want parens.
self.prec = PRECEDENCE["yield"] - 1 self.prec = PRECEDENCE["yield"] - 1
self.n_expr(node[0]) self.n_expr(node[0])
p = self.prec
else: else:
self.n_expr(node) self.n_expr(node)

2
uncompyle6/version.py
View File

@@ -12,4 +12,4 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# This file is suitable for sourcing inside POSIX shell as # This file is suitable for sourcing inside POSIX shell as
# well as importing into Python # well as importing into Python
VERSION="3.7.2" # noqa VERSION="3.7.3" # noqa