Merge branch 'master' of github.com:rocky/python-uncompyle6

Move forward on moagstar's Python 3.6 support

ChangeLog

@@ -1,3 +1,409 @@
+2016-08-03  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/version.py: Get ready for release 2.8.0
+
+2016-07-29  rocky <rb@dustyfeet.com>
+
+	* test/Makefile, uncompyle6/semantics/fragments.py: Small changes
+
+2016-07-29  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parsers/parse35.py, uncompyle6/scanner.py,
+	uncompyle6/scanners/scanner3.py, uncompyle6/semantics/pysource.py: 
+	Fix 3.5 misclassifying RETURN_VALUE We use location of SETUP_EXCEPT instructions to disambiguate.
+
+2016-07-28  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parsers/parse2.py, uncompyle6/parsers/parse23.py,
+	uncompyle6/parsers/parse24.py: while1 bug applied to Python 2.3 and
+	2.4
+
+2016-07-28  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/scanners/scanner3.py, uncompyle6/scanners/tok.py: PyPy
+	3.2 bug confusing RETURN_END_IF for except Also fix a instruction formatting bug
+
+2016-07-27  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parser.py, uncompyle6/parsers/parse3.py,
+	uncompyle6/parsers/parse35.py: Split out 3.5 parser
+
+2016-07-27  rocky <rb@dustyfeet.com>
+
+	* pytest/test_grammar.py, uncompyle6/parser.py,
+	uncompyle6/parsers/parse2.py, uncompyle6/parsers/parse3.py,
+	uncompyle6/parsers/parse34.py: Add python 3.4 grammar checking DRY grammar testing
+
+2016-07-27  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parsers/parse25.py, uncompyle6/parsers/parse26.py,
+	uncompyle6/parsers/parse27.py, uncompyle6/parsers/parse3.py,
+	uncompyle6/parsers/parse34.py: Clean and check Python 2.6 grammar
+
+2016-07-27  rocky <rb@dustyfeet.com>
+
+	* pytest/test_grammar.py, uncompyle6/parser.py,
+	uncompyle6/parsers/parse2.py, uncompyle6/parsers/parse26.py,
+	uncompyle6/parsers/parse27.py, uncompyle6/parsers/parse3.py: Start
+	to segregate and clean up grammar
+
+2016-07-27  rocky <rb@dustyfeet.com>
+
+	* pytest/test_grammar.py, uncompyle6/disas.py,
+	uncompyle6/scanner.py, uncompyle6/semantics/fragments.py: Add
+	is_pypy parameter to places that need it
+
+2016-07-27  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/stmts/09_whiletrue_bug.py,
+	uncompyle6/parser.py, uncompyle6/parsers/parse2.py,
+	uncompyle6/parsers/parse26.py, uncompyle6/parsers/parse27.py,
+	uncompyle6/scanners/scanner2.py, uncompyle6/scanners/scanner3.py,
+	uncompyle6/semantics/pysource.py: 2.6 and 2.7 while1 grammar rule Fixes issue #40
+
+2016-07-27  rocky <rb@dustyfeet.com>
+
+	* pytest/test_grammar.py, uncompyle6/parser.py,
+	uncompyle6/parsers/parse3.py: Start grammar checker
+
+2016-07-27  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/main.py, uncompyle6/show.py: Show magic number in
+	output Fix bugs due to removal of token.format()
+
+2016-07-27  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/disas.py, uncompyle6/parsers/parse2.py,
+	uncompyle6/parsers/parse3.py, uncompyle6/scanners/scanner2.py,
+	uncompyle6/scanners/scanner27.py, uncompyle6/scanners/scanner3.py,
+	uncompyle6/scanners/scanner35.py, uncompyle6/scanners/tok.py,
+	uncompyle6/show.py: tok.format -> tok.__str__; simplify pypy code
+
+2016-07-27  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/semantics/pysource.py, uncompyle6/verify.py: Python 2.7
+	set comprehension bug
+
+2016-07-27  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/semantics/pysource.py: separate semantic action version
+	differences Added customize_for_version which uses is_pypy and version to adjust
+	tables
+
+2016-07-27  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/semantics/fragments.py,
+	uncompyle6/semantics/pysource.py: Customize tables better for
+	specific Python versions
+
+2016-07-27  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parsers/parse2.py, uncompyle6/semantics/pysource.py: 
+	Small code clean up
+
+2016-07-26  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/scanners/tok.py, uncompyle6/semantics/fragments.py,
+	uncompyle6/verify.py: Usuability fixes * try using format for __str__ * Explicitly nuke self.attr and self.pattr when no arg * Sync pysource and format wrt make_function
+
+2016-07-26  rocky <rb@dustyfeet.com>
+
+	* ChangeLog, NEWS, README.rst, __pkginfo__.py, requirements.txt,
+	test/test_pyenvlib.py, uncompyle6/version.py: Get ready for release
+	2.7.1
+
+2016-07-26  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug_pypy27/00_assign_pypy.py,
+	test/simple_source/bug_pypy27/03_try_return.py, uncompyle6/main.py,
+	uncompyle6/parsers/parse2.py, uncompyle6/scanners/scanner2.py,
+	uncompyle6/semantics/pysource.py: Custom PyPy rules for
+	tryfinallysmt, assign{2,3}
+
+2016-07-26  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug_pypy27/01_assert2.py,
+	test/simple_source/bug_pypy27/03_try_return.py,
+	uncompyle6/parser.py, uncompyle6/parsers/parse2.py,
+	uncompyle6/parsers/parse27.py, uncompyle6/scanners/scanner2.py,
+	uncompyle6/scanners/scanner3.py, uncompyle6/semantics/pysource.py: 
+	More PyPy grammar rules * assert one and two-arg form * trystmt Simplify adding multiple grammar rules
+
+2016-07-25  rocky <rb@dustyfeet.com>
+
+	* pytest/testdata/if-2.7.right, pytest/testdata/ifelse-2.7.right,
+	uncompyle6/scanners/tok.py: Instruction formatting - yet again
+
+2016-07-25  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parsers/parse2.py, uncompyle6/parsers/parse3.py,
+	uncompyle6/semantics/pysource.py: Add grammar for PyPy 2-arg assert
+
+2016-07-25  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parsers/parse2.py, uncompyle6/parsers/parse3.py,
+	uncompyle6/scanners/scanner2.py, uncompyle6/scanners/scanner3.py,
+	uncompyle6/scanners/tok.py, uncompyle6/semantics/pysource.py: PyPy
+	BUILD_MAP_n. Reinstate bytecode tests
+
+2016-07-25  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parser.py, uncompyle6/parsers/parse2.py: Handle PyPy
+	BUILD_MAP_0 where actual kw_args > 0
+
+2016-07-25  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parsers/parse2.py, uncompyle6/parsers/parse3.py: Clean
+	up PyPy load_attr grammar rules
+
+2016-07-25  rocky <rb@dustyfeet.com>
+
+	* Makefile: Enable more PyPy testing
+
+2016-07-25  rocky <rb@dustyfeet.com>
+
+	* test/Makefile: Start checking PyPy bytecodes
+
+2016-07-25  rocky <rb@dustyfeet.com>
+
+	* test/Makefile, uncompyle6/scanners/pypy27.py,
+	uncompyle6/scanners/pypy32.py: Add pypy scanners
+
+2016-07-25  rocky <rb@dustyfeet.com>
+
+	* __pkginfo__.py, requirements.txt, test/Makefile,
+	test/simple_source/bug27+/05_setattr.py,
+	uncompyle6/parsers/parse2.py, uncompyle6/parsers/parse3.py,
+	uncompyle6/scanners/scanner2.py, uncompyle6/scanners/scanner27.py,
+	uncompyle6/scanners/scanner3.py: Handle PyPy CALL_METHOD op more
+	correctly Start testing pypy2.7 and 3.2 bytecodes
+
+2016-07-25  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parsers/parse2.py: add_custom_rules() in 2.x and 3.x
+	are more alike
+
+2016-07-25  rocky <rb@dustyfeet.com>
+
+	* README.rst, test/simple_source/stmts/03_if_elif.py,
+	uncompyle6/parsers/parse2.py, uncompyle6/parsers/parse27.py,
+	uncompyle6/parsers/parse3.py, uncompyle6/scanners/scanner2.py,
+	uncompyle6/scanners/scanner3.py, uncompyle6/semantics/pysource.py: 
+	Handle PyPy JUMP_IF_NOT_DEBUG Update README.rst to note PyPY and reorganize a little
+
+2016-07-25  rocky <rb@dustyfeet.com>
+
+	* pytest/testdata/if-2.7.right, pytest/testdata/ifelse-2.7.right,
+	uncompyle6/scanners/scanner2.py, uncompyle6/scanners/scanner26.py,
+	uncompyle6/scanners/scanner3.py, uncompyle6/scanners/tok.py: Better
+	assembly formatting of jump instructions
+
+2016-07-24  rocky <rb@dustyfeet.com>
+
+	* Makefile, test/Makefile, uncompyle6/parsers/parse2.py,
+	uncompyle6/parsers/parse3.py, uncompyle6/scanners/scanner3.py: More
+	PyPy LOOKUP_METHOD rules
+
+2016-07-24  rocky <rb@dustyfeet.com>
+
+	* Makefile, __pkginfo__.py, pytest/test_fjt.py, requirements.txt,
+	test/Makefile, test/test_pythonlib.py,
+	uncompyle6/parsers/parse2.py, uncompyle6/parsers/parse3.py,
+	uncompyle6/scanner.py, uncompyle6/scanners/scanner2.py,
+	uncompyle6/scanners/scanner3.py, uncompyle6/semantics/pysource.py: 
+	PyPy support * Use proper PYPY 32 opcodes * handle opcodes LOOKUP_METHOD and CALL_METHOD * Administrative stuff for PyPy
+
+2016-07-24  rocky <rb@dustyfeet.com>
+
+	* test/add-test.py: add-test: Make sure PyPy bytecode is separated
+
+2016-07-24  rocky <rb@dustyfeet.com>
+
+	* : commit 21683719e1a07d51095d32200ec294d659746474 Author: rocky
+	<rb@dustyfeet.com> Date:   Sun Jul 24 04:16:54 2016 -0400
+
+2016-07-24  rocky <rb@dustyfeet.com>
+
+	* : commit 7e8173b07620c344a73660b354f05a61c4723d18 Author: rocky
+	<rb@dustyfeet.com> Date:   Sun Jul 24 03:44:26 2016 -0400
+
+2016-07-23  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug27+/05_for_try_except.py,
+	uncompyle6/scanners/scanner2.py, uncompyle6/scanners/scanner27.py: 
+	Another 2.7 'continue' detection bug
+
+2016-07-23  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug27+/05_for_try_except.py,
+	uncompyle6/scanners/scanner2.py, uncompyle6/scanners/scanner27.py: 
+	Another 2.7 'continue' detection bug
+
+2016-07-23  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug27+/05_for_try_except.py,
+	uncompyle6/scanners/scanner2.py, uncompyle6/scanners/scanner27.py: 
+	Another 2.7 'continue' detection bug
+
+2016-07-23  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug27+/05_for_try_except.py,
+	uncompyle6/scanners/scanner2.py: 2.7: Detect "continue" inside
+	except Fixes issue #38.  This is a bit hacky. We need a more general "continue" detection.
+
+2016-07-23  rocky <rb@dustyfeet.com>
+
+	* : commit a5f45f232decad2e74bfdf476255604273fd95fd Author: rocky
+	<rb@dustyfeet.com> Date:   Sat Jul 23 10:37:41 2016 -0400
+
+2016-07-21  rocky <rb@dustyfeet.com>
+
+	* __pkginfo__.py, test/test_pyenvlib.py, uncompyle6/disas.py,
+	uncompyle6/main.py, uncompyle6/parser.py,
+	uncompyle6/parsers/parse27.py, uncompyle6/scanner.py,
+	uncompyle6/scanners/scanner2.py, uncompyle6/scanners/scanner27.py,
+	uncompyle6/semantics/fragments.py,
+	uncompyle6/semantics/pysource.py, uncompyle6/verify.py: Start
+	handling pypy 2.7 Need to understand whether we care compiling pypy.  Pypy 2.7 list
+	comprehensions are different and use its own opcode.
+
+2016-07-20  rocky <rb@dustyfeet.com>
+
+	* HISTORY.md, README.rst: Update HISTORY and add link to it in
+	README.md
+
+2016-07-17  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parser.py, uncompyle6/semantics/pysource.py: Better
+	parse error formatting Start to move away for compiler-oriented terminology:    Favor "instructions" over "tokens".  Syntax error -> Parse error.
+
+2016-07-17  rocky <rb@dustyfeet.com>
+
+	* pytest/testdata/if-2.7.right, pytest/testdata/ifelse-2.7.right,
+	uncompyle6/scanners/scanner2.py, uncompyle6/scanners/tok.py: Align
+	disassembly output with xdis align number of offset fields with xdis.  Show None type when we
+	mean None, not ''
+
+2016-07-17  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/scanners/scanner3.py: Respect after/both option in
+	scanner3
+
+2016-07-17  rocky <rb@dustyfeet.com>
+
+	* pytest/testdata/if-2.7.right, pytest/testdata/ifelse-2.7.right: 
+	Adjust test data for changed disasm output
+
+2016-07-16  rocky <rb@dustyfeet.com>
+
+	* : commit 942b15e3c62963b32aaba877fd451ffe304c07a9 Author: rocky
+	<rb@dustyfeet.com> Date:   Sat Jul 16 14:12:31 2016 -0400
+
+2016-07-16  rocky <rb@dustyfeet.com>
+
+	* README.rst: More explicit usage info
+
+2016-07-15  rocky <rb@dustyfeet.com>
+
+	* README.rst, test/Makefile,
+	test/simple_source/bug35/01_matrix_multiply.py,
+	uncompyle6/parsers/parse3.py, uncompyle6/semantics/pysource.py: Add
+	3.5 matrix mult ops We now run 3.5 verifycation so we need to remove some of the tests
+	that fail to verify pending fixing.
+
+2016-07-15  rocky <rb@dustyfeet.com>
+
+	* ChangeLog, NEWS, README.rst, uncompyle6/version.py: Get ready for
+	release 2.7.0
+
+2016-07-14  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parser.py, uncompyle6/parsers/parse2.py,
+	uncompyle6/scanners/scanner2.py, uncompyle6/scanners/scanner26.py,
+	uncompyle6/semantics/pysource.py: Isolate pseudo op IMPORT_NAME_CONT I think this is a holdover from pre 2.3 days. Possibly it can be
+	dropped altogether.
+
+2016-07-14  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parsers/parse3.py, uncompyle6/semantics/pysource.py: 
+	Attempt to get 3.5 RETURN_END_IF working This feels hacky and I'm not sure is quite right.  Untili we
+	understand better what to do though, we'll go with it.
+
+2016-07-14  rocky <rb@dustyfeet.com>
+
+	* test/Makefile, uncompyle6/semantics/pysource.py: 3.x __qualname__
+	= supression Class names have become more complicated so the pattern test needs
+	to be more complex as well. Sigh
+
+2016-07-14  rocky <rb@dustyfeet.com>
+
+	* README.rst, uncompyle6/semantics/fragments.py,
+	uncompyle6/semantics/pysource.py: 3.x list comprehenions
+	list_if_not, comp_ifnot bug Saw only list_if_not bug, but might also be applicable to comp_ifnot
+
+2016-07-14  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/stmts/15_assert.py,
+	uncompyle6/scanners/scanner3.py: 3.x ""raise AssertionError" vs
+	"assert" Not sure this is totally correct yet.
+
+2016-07-14  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/main.py, uncompyle6/parsers/parse3.py,
+	uncompyle6/parsers/parse34.py, uncompyle6/scanners/scanner2.py,
+	uncompyle6/scanners/scanner26.py, uncompyle6/scanners/scanner3.py,
+	uncompyle6/verify.py: Python 3.4 assertion handling. Improve verify 3.4 has jump optimization like 3.5.  verify.py: show mismatch on
+	verification mismatch
+
+2016-07-13  rocky <rb@dustyfeet.com>
+
+	* : Reinstate some code for verification
+
+2016-07-13  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/main.py: Back off showing verification errors Pending why this failing in make.
+
+2016-07-13  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/semantics/pysource.py: "return None" -> "pass" Python 3.4 classes have what looks like a return None, but this is
+	invalid syntax. So for now we'll remove all "return None"s.  There may be a "pass" in there instead.
+
+2016-07-13  rocky <rb@dustyfeet.com>
+
+	* : commit fd0d8d25672b9450bafc1d5c6781bedd7ec8bd1d Author: rocky
+	<rb@dustyfeet.com> Date:   Wed Jul 13 13:00:03 2016 -0400
+
+2016-07-13  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/stmts/11_return_val.py,
+	uncompyle6/semantics/pysource.py: Debugging smutz caused verify
+	failures
+
+2016-07-12  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parsers/parse3.py, uncompyle6/semantics/fragments.py,
+	uncompyle6/semantics/pysource.py: Document/correct hide_internal and
+	store_locals
+
+2016-07-12  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug33/05_store_locals.py,
+	test/simple_source/bug33/05_store_name.py,
+	uncompyle6/semantics/pysource.py: Better 3.2/33 store_locals
+	handling
+
+2016-07-11  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug33/05_store_name.py,
+	test/simple_source/comprehension/05_3x_set_comphension.py,
+	uncompyle6/parsers/parse3.py, uncompyle6/semantics/pysource.py: 
+	Python 3.2 & 3.3 handle STORE_NAME better
+
+2016-07-11  rocky <rb@dustyfeet.com>
+
+	* ChangeLog, NEWS, README.rst, uncompyle6/version.py: Get ready for
+	release 2.6.2
+
 2016-07-11  rocky <rb@dustyfeet.com>
 
 	* test/add-test.py,

HISTORY.md

@@ -112,8 +112,7 @@ Fenx's uncompyle3 which I used for inspiration for Python3 support.
 I started working on this late 2015, mostly to add fragment support.
 In that, I decided to make this runnable on Python 3.2+ and Python 2.6+
 while, handling Python bytecodes from Python versions 2.5+ and
-3.2+. (I think I could go back further, but I'd consider doing that
-only after code is better cleaned up and supports Python 3 better.)
+3.2+.
 
 Over the many years, code styles and Python features have
 changed. However brilliant the code was and still is, it hasn't really

Makefile

@@ -33,13 +33,21 @@ check-2.7 check-3.3 check-3.4: pytest
 
 #: Tests for Python 3.2 and 3.5 - pytest doesn't work here
 # Or rather 3.5 doesn't work not on Travis
-check-3.2 check-3.5:
+check-3.2 check-3.5 check-3.6:
 	$(MAKE) -C test $@
 
 #:Tests for Python 2.6 (doesn't have pytest)
 check-2.6:
 	$(MAKE) -C test $@
 
+#:PyPy 2.6.1 or PyPy 5.0.1
+# Skip for now
+2.6 5.0:
+
+#:PyPy pypy3-2.4.0 Python 3:
+pypy-3.2 2.4:
+	$(MAKE) -C test $@
+
 #: Run py.test tests
 pytest:
 	$(MAKE) -C pytest check

NEWS

@@ -1,3 +1,27 @@
+uncompyle6 2.8.0 2016-08-03
+
+- Start Python 3.6 support (moagstar)
+  more work on PEP 498 needed
+- tidy bytecode/word output
+- numerous decompiling bugs fixed
+- grammar testing started
+- show magic number in deparsed output
+- better grammar and semantic action segregation based
+  on python bytecode version
+
+uncompyle6 2.7.1 2016-07-26
+
+- PyPy bytecodes for 2.7 and 3.2 added
+- Instruction formatting improved slightly
+- 2.7 bytecode "continue" bug fixed
+
+uncompyle6 2.7.0 2016-07-15
+
+- Many Syntax and verifification bugs removed
+  tested on standard libraries from 2.3.7 to 3.5.1
+  and they all decompile and verify fine.
+  I'm sure there are more bugs though.
+
 uncompyle6 2.6.2 2016-07-11 Manhattenhenge
 
 - Extend bytecodes back to 2.3

README.rst

@@ -11,19 +11,20 @@ Introduction
 ------------
 
 *uncompyle6* translates Python bytecode back into equivalent Python
-source code. It accepts bytecodes from Python version 2.3 to 3.5 or
-so. The code requires Python 2.6 or later and has been tested on Python
-running versions 2.3-2.7, and 3.2-3.5.
+source code. It accepts bytecodes from Python version 2.3 to 3.6 or
+so, including PyPy bytecode.
 
 Why this?
 ---------
 
 There were a number of decompyle, uncompile, uncompyle2, uncompyle3
-forks around. All of them come basically from the same code base, and
-almost all of them not maintained very well. This code pulls these together
-and addresses a number of open issues in those.
+forks around. All of them came basically from the same code base, and
+almost all of them no were no longer actively maintained. Only one
+handled Python 3, and even there, only 3.2. This code pulls these
+together and moves forward. It also addresses a number of open issues
+in the previous forks.
 
-What makes this different from other CPython bytecode decompilers?  Its
+What makes this different from other CPython bytecode decompilers?: its
 ability to deparse just fragments and give source-code information
 around a given bytecode offset.
 
@@ -39,6 +40,13 @@ location in more detail than just a line number.  It can be also used
 when source-code information does not exist and there is just bytecode
 information.
 
+Requirements
+------------
+
+This project requires Python 2.6 or later, PyPy 3-2.4, or PyPy-5.0.1.
+The bytecode files it can read has been tested on Python bytecodes from
+versions 2.3-2.7, and 3.2-3.6 and the above-mentioned PyPy versions.
+
 Installation
 ------------
 
@@ -76,29 +84,33 @@ Run
 
 ::
 
-     ./bin/uncompyle6 -h
+$ uncompyle6 *compiled-python-file-pyc-or-pyo*
 
-for usage help.
+For usage help:
+
+::
+
+   $ uncompyle6 -h
 
 
 Known Bugs/Restrictions
 -----------------------
 
-Python 2 deparsing decompiles each and all the Python 2.3 to 2.7.10
-installed packages I have on my system. Later distributions average
-about 200 files.
+Python 2 deparsing decompiles and about 90% verifies from Python 2.3.7 to Python
+3.4.2 on the standard library packages I have on my system.
 
-More than 90% of the 2.7 files verify ok Some of these failures may be
-bugs in the verification process.  At this point, 2.7 decompilation is
-better than uncompyle2. A number of bugs have been fixed over what was
-in uncompyle2.
+(Verification is the process of decompiling bytecode, compiling with a
+Python for that byecode version, and then comparing the byetcode
+produced by the decompiled/compiled program. Some allowance is made
+for inessential differences.)
 
-That said, I'd like the decompilation process still feels a little bit
-hacky in certain places and we still get parse errors too often.
+Later distributions average about 200 files. At this point, 2.7
+decompilation is better than uncompyle2. A number of bugs have been
+fixed.
 
-There are a few constructs that still need to be added to Python 3.5.
+Python 3.5 largely works, but still has some bugs in it.
 Python 3.6 changes things drastically by using word codes rather than
-byte codes. So that will be yet another challenge.
+byte codes, and that needs to be addressed.
 
 There is lots to do, so please dig in and help.
 
@@ -106,14 +118,12 @@ See Also
 --------
 
 * https://github.com/zrax/pycdc : supports all versions of Python and is written in C++
-* https://code.google.com/archive/p/unpyc3/ : supports Python 3.2 only
-
-The above projects use a different decompiling technique what is used here.
-
-The HISTORY file.
+* https://code.google.com/archive/p/unpyc3/ : supports Python 3.2 only. The above projects use a different decompiling technique what is used here.
+* The HISTORY_ file.
 
 .. |downloads| image:: https://img.shields.io/pypi/dd/uncompyle6.svg
 .. _trepan: https://pypi.python.org/pypi/trepan
+.. _HISTORY: https://github.com/rocky/python-uncompyle6/blob/master/HISTORY.md
 .. _debuggers: https://pypi.python.org/pypi/trepan3k
 .. _remake: https://bashdb.sf.net/remake
 .. _pycdc: https://github.com/zrax/pycdc

__pkginfo__.py

@@ -37,7 +37,7 @@ entry_points={
     ]}
 ftp_url            = None
 install_requires   = ['spark-parser >= 1.4.0',
-                      'xdis >= 1.1.7']
+                      'xdis >= 2.1.0']
 license            = 'MIT'
 mailing_list       = 'python-debugger@googlegroups.com'
 modname            = 'uncompyle6'

pytest/test_fjt.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from uncompyle6 import PYTHON_VERSION
+from uncompyle6 import PYTHON_VERSION, IS_PYPY
 from uncompyle6.scanner import get_scanner
 from array import array
 def bug(state, slotstate):
@@ -12,7 +12,7 @@ def test_if_in_for():
     code = bug.__code__
     scan = get_scanner(PYTHON_VERSION)
     print(PYTHON_VERSION)
-    if 2.7 <= PYTHON_VERSION <= 3.0:
+    if 2.7 <= PYTHON_VERSION <= 3.0 and not IS_PYPY:
         n = scan.setup_code(code)
         scan.build_lines_data(code, n)
         scan.build_prev_op(n)

pytest/test_grammar.py

@@ -0,0 +1,44 @@
+import pytest, re
+from uncompyle6 import PYTHON_VERSION, PYTHON3, IS_PYPY # , PYTHON_VERSION
+from uncompyle6.parser import get_python_parser
+from uncompyle6.scanner import get_scanner
+
+def test_grammar():
+
+    def check_tokens(tokens, opcode_set):
+        remain_tokens = set(tokens) - opcode_set
+        remain_tokens = set([re.sub('_\d+$','', t) for t in remain_tokens])
+        remain_tokens = set([re.sub('_CONT$','', t) for t in remain_tokens])
+        remain_tokens = set(remain_tokens) - opcode_set
+        assert remain_tokens == set([]), \
+            "Remaining tokens %s\n====\n%s" % (remain_tokens, p.dumpGrammar())
+
+    p = get_python_parser(PYTHON_VERSION, is_pypy=IS_PYPY)
+    lhs, rhs, tokens, right_recursive = p.checkSets()
+    expect_lhs = set(['expr1024', 'pos_arg'])
+    unused_rhs = set(['build_list', 'call_function', 'mkfunc', 'mklambda',
+                      'unpack', 'unpack_list'])
+    expect_right_recursive = [['designList', ('designator', 'DUP_TOP', 'designList')]]
+    if PYTHON3:
+        expect_lhs.add('load_genexpr')
+        unused_rhs = unused_rhs.union(set("""
+        except_pop_except genexpr classdefdeco2 listcomp
+        """.split()))
+    else:
+        expect_lhs.add('kwarg')
+    assert expect_lhs == set(lhs)
+    assert unused_rhs == set(rhs)
+    assert expect_right_recursive == right_recursive
+    s = get_scanner(PYTHON_VERSION, IS_PYPY)
+    ignore_set = set(
+            """JUMP_BACK CONTINUE RETURN_END_IF COME_FROM
+               LOAD_GENEXPR LOAD_ASSERT LOAD_SETCOMP LOAD_DICTCOMP
+               LAMBDA_MARKER RETURN_LAST
+            """.split())
+    if 2.6 <= PYTHON_VERSION <= 2.7:
+        opcode_set = set(s.opc.opname).union(ignore_set)
+        check_tokens(tokens, opcode_set)
+    elif PYTHON_VERSION == 3.4:
+        ignore_set.add('LOAD_CLASSNAME')
+        opcode_set = set(s.opc.opname).union(ignore_set)
+        check_tokens(tokens, opcode_set)

pytest/testdata/if-2.7.right

@@ -2,11 +2,11 @@
 # Embedded file name: simple_source/branching/05_if.py
 
    6       0  LOAD_NAME             0  'True'
-           3  POP_JUMP_IF_FALSE    15  '15'
+           3  POP_JUMP_IF_FALSE    15  'to 15'
 
    7       6  LOAD_NAME             1  'False'
            9  STORE_NAME            2  'b'
-          12  JUMP_FORWARD          0  '15'
+          12  JUMP_FORWARD          0  'to 15'
         15_0  COME_FROM                '12'
           15  LOAD_CONST            0  ''
-          18  RETURN_VALUE             ''
+          18  RETURN_VALUE     

pytest/testdata/ifelse-2.7.right

@@ -2,14 +2,14 @@
 # Embedded file name: simple_source/branching/05_ifelse.py
 
    3       0  LOAD_NAME             0  'True'
-           3  POP_JUMP_IF_FALSE    15  '15'
+           3  POP_JUMP_IF_FALSE    15  'to 15'
 
    4       6  LOAD_CONST            0  1
            9  STORE_NAME            1  'b'
-          12  JUMP_FORWARD          6  '21'
+          12  JUMP_FORWARD          6  'to 21'
 
    6      15  LOAD_CONST            1  2
           18  STORE_NAME            2  'd'
         21_0  COME_FROM                '12'
           21  LOAD_CONST            2  ''
-          24  RETURN_VALUE             ''
+          24  RETURN_VALUE     

requirements.txt

@@ -1 +1,2 @@
 spark-parser >= 1.2.1
+xdis >= 2.1.0

test/Makefile

@@ -30,28 +30,36 @@ check-3.2: check-bytecode
 check-3.3: check-bytecode
 	$(PYTHON) test_pythonlib.py --bytecode-3.3 --verify $(COMPILE)
 
-#: Run working tests from Python 3.5
-check-3.5: check-bytecode
-
 #: Run working tests from Python 3.4
 check-3.4: check-bytecode check-3.4-ok check-2.7-ok
 	$(PYTHON) test_pythonlib.py --bytecode-3.4 --verify $(COMPILE)
 
+#: Run working tests from Python 3.5
+check-3.5: check-bytecode
+	$(PYTHON) test_pythonlib.py --bytecode-3.5 --verify $(COMPILE)
+
+#: Run working tests from Python 3.6
+check-3.6: check-bytecode
+	$(PYTHON) test_pythonlib.py --bytecode-3.6 --verify $(COMPILE)
+
 #: Check deparsing only, but from a different Python version
 check-disasm:
 	$(PYTHON) dis-compare.py
 
 #: Check deparsing bytecode 2.x only
 check-bytecode-2:
-	$(PYTHON) test_pythonlib.py --bytecode-2.3 --bytecode-2.4 --bytecode-2.5 --bytecode-2.6 --bytecode-2.7
+	$(PYTHON) test_pythonlib.py --bytecode-2.3 --bytecode-2.4 \
+        --bytecode-2.5 --bytecode-2.6 --bytecode-2.7 --bytecode-pypy2.7
 
 #: Check deparsing bytecode 3.x only
 check-bytecode-3:
-	$(PYTHON) test_pythonlib.py --bytecode-3.2 --bytecode-3.3 --bytecode-3.4 --bytecode-3.5
+	$(PYTHON) test_pythonlib.py --bytecode-3.2 --bytecode-3.3 \
+       --bytecode-3.4 --bytecode-3.5 --bytecode-3.6 --bytecode-pypy3.2
 
 #: Check deparsing bytecode that works running Python 2 and Python 3
 check-bytecode: check-bytecode-3
-	$(PYTHON) test_pythonlib.py --bytecode-2.3 --bytecode-2.4 --bytecode-2.5 --bytecode-2.6 --bytecode-2.7
+	$(PYTHON) test_pythonlib.py --bytecode-2.3 --bytecode-2.4 \
+        --bytecode-2.5 --bytecode-2.6 --bytecode-2.7 --bytecode-pypy2.7
 
 #: Check deparsing Python 2.3
 check-bytecode-2.3:
@@ -89,6 +97,10 @@ check-bytecode-3.4:
 check-bytecode-3.5:
 	$(PYTHON) test_pythonlib.py --bytecode-3.5
 
+#: Check deparsing Python 3.6
+check-bytecode-3.6:
+	$(PYTHON) test_pythonlib.py --bytecode-3.6
+
 #: short tests for bytecodes only for this version of Python
 check-native-short:
 	$(PYTHON) test_pythonlib.py --bytecode-$(PYTHON_VERSION) --verify $(COMPILE)
@@ -109,6 +121,18 @@ check-3.2-ok:
 check-3.4-ok:
 	$(PYTHON) test_pythonlib.py --ok-3.4 --verify $(COMPILE)
 
+#: PyPy of some sort. E.g. [PyPy 5.0.1 with GCC 4.8.4]
+# Skip for now
+2.6:
+
+#: PyPy 5.0.x with Python 2.7 ...
+pypy-2.7 5.0 5.3:
+	$(PYTHON) test_pythonlib.py --bytecode-pypy2.7 --verify
+
+#: PyPy 2.4.x with Python 3.2 ...
+pypy-3.2 2.4:
+	$(PYTHON) test_pythonlib.py --bytecode-pypy3.2 --verify
+
 clean: clean-py-dis clean-dis clean-unverified
 
 clean-dis:

test/add-test.py

@@ -6,7 +6,10 @@ assert len(sys.argv) >= 2
 version = sys.version[0:3]
 for path in sys.argv[1:]:
     short = os.path.basename(path)
-    cfile =  "bytecode_%s/%s" % (version, short) + 'c'
+    if hasattr(sys, 'pypy_version_info'):
+        cfile =  "bytecode_pypy%s/%s" % (version, short) + 'c'
+    else:
+        cfile =  "bytecode_%s/%s" % (version, short) + 'c'
     print("byte-compiling %s to %s" % (path, cfile))
     py_compile.compile(path, cfile)
     if isinstance(version, str) or version >= (2, 6, 0):

test/simple_source/bug27+/05_for_try_except.py

@@ -0,0 +1,18 @@
+# Issue #38 in Python 2.7
+# Problem is distinguishing 'continue' from 'jump_back'
+# in assembly instructions.
+
+# Here, we hack looking for two jump backs
+# followed by the end of the except. This
+# is a big hack.
+
+for a in [__name__]:
+    try:len(a)
+    except:continue
+
+# The above has JUMP_ABSOLUTE in it.
+#  This has JUMP_FORWARD instead.
+for a in [__name__]:
+    try:len(a)
+    except:continue
+    y = 2