Get ready for release 2.9.0 ...

- Use xdis 3.0.0 protocol load_module. Needs bump in requirements.txt
  and _pkg_info_.py
- Start Python 1.5 decompiling - another round of work is needed to remove
  bugs
- small cleanups

.travis.yml

@@ -4,8 +4,9 @@ sudo: false
 
 python:
   - '3.5'
-  - '2.7.11'
+  - '2.7.12'
   - '2.6'
+  - '3.3'
   - '3.4'
 
 install:

ChangeLog

@@ -1,3 +1,438 @@
+2016-10-10  rocky <rb@dustyfeet.com>
+
+	* __pkginfo__.py, requirements.txt, uncompyle6/disas.py,
+	uncompyle6/main.py, uncompyle6/parser.py,
+	uncompyle6/parsers/parse2.py, uncompyle6/scanner.py,
+	uncompyle6/scanners/scanner2.py, uncompyle6/scanners/scanner26.py,
+	uncompyle6/verify.py, uncompyle6/version.py: Get ready for release
+	2.9.0 ...  - Use xdis 3.0.0 protocol load_module. Needs bump in
+	  requirements.txt and _pkg_info_.py - Start Python 1.5 decompiling - another round of work is needed to
+	  remove bugs - small cleanups
+
+2016-10-09  rocky <rb@dustyfeet.com>
+
+	* : Reinstate some tests
+
+2016-10-08  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/bin/uncompile.py, uncompyle6/parsers/parse21.py,
+	uncompyle6/semantics/pysource.py: Simpify python 2.1 grammar Fix bug
+	with -t ...  Wasn't showing source text when -t option was given
+
+2016-10-08  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug22/06_list_comprehension_x2_if.py,
+	uncompyle6/parsers/parse22.py, uncompyle6/parsers/parse26.py: Python
+	2.1-2.6 bug in list comprehension
+
+2016-10-08  rocky <rb@dustyfeet.com>
+
+	* ChangeLog, NEWS, uncompyle6/version.py: Get ready for release
+	2.8.4
+
+2016-10-08  rocky <rb@dustyfeet.com>
+
+	* README.rst, test/Makefile, test/decompyle/README.md,
+	test/decompyle/test_applyEquiv.py,
+	test/decompyle/test_augmentedAssign.py,
+	test/decompyle/test_class.py, test/decompyle/test_del.py,
+	test/decompyle/test_divide_future.py,
+	test/decompyle/test_divide_no_future.py,
+	test/decompyle/test_docstring.py, test/decompyle/test_empty.py,
+	test/decompyle/test_exceptions.py, test/decompyle/test_exec.py,
+	test/decompyle/test_expressions.py,
+	test/decompyle/test_extendedImport.py,
+	test/decompyle/test_extendedPrint.py,
+	test/decompyle/test_extendedarg.py,
+	test/decompyle/test_functions.py, test/decompyle/test_global.py,
+	test/decompyle/test_globals.py, test/decompyle/test_import.py,
+	test/decompyle/test_import_as.py, test/decompyle/test_integers.py,
+	test/decompyle/test_iterators.py, test/decompyle/test_lambda.py,
+	test/decompyle/test_listComprehensions.py,
+	test/decompyle/test_loops.py, test/decompyle/test_loops2.py,
+	test/decompyle/test_misc.py, test/decompyle/test_nested_elif.py,
+	test/decompyle/test_nested_scopes.py,
+	test/decompyle/test_prettyprint.py, test/decompyle/test_print.py,
+	test/decompyle/test_print_to.py,
+	test/decompyle/test_single_stmt.py, test/decompyle/test_slices.py,
+	test/decompyle/test_tuple_params.py, test/decompyle/test_tuples.py,
+	test/decompyle/test_yield.py, test/ok_lib2.7/compiler/syntax.py: Add
+	decompyle's 2.1 tests Update README.rst to note new pythons supported since last update
+
+2016-10-07  rocky <rb@dustyfeet.com>
+
+	* __pkginfo__.py, test/test_pythonlib.py, uncompyle6/parser.py,
+	uncompyle6/parsers/parse2.py, uncompyle6/parsers/parse21.py,
+	uncompyle6/scanner.py, uncompyle6/scanners/scanner21.py,
+	uncompyle6/scanners/scanner22.py, uncompyle6/scanners/scanner27.py,
+	uncompyle6/semantics/pysource.py: Start Python 2.1 bytecode
+	decompile
+
+2016-10-06  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/main.py: Use .py extension in disassembled files more
+	often
+
+2016-10-06  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/scanners/controlflow.py,
+	uncompyle6/scanners/scanner3.py: Merge in COME_FROM disambiguation
+	...  from controlflowbranch. Should probably expand to Python2 parsers as
+	well
+
+2016-10-06  rocky <rb@dustyfeet.com>
+
+	* : commit a4dd6e980566a83270b9b9d47fb7f3cb3e5e385a Author: rocky
+	<rb@dustyfeet.com> Date:   Wed Oct 5 22:56:48 2016 -0400
+
+2016-10-05  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parser.py, uncompyle6/parsers/parse2.py,
+	uncompyle6/parsers/parse3.py: Python 3: "or" doesn't have optional
+	come_from
+
+2016-10-05  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parser.py, uncompyle6/parsers/parse2.py,
+	uncompyle6/parsers/parse3.py, uncompyle6/scanners/scanner3.py: 
+	Python 3: "and" doesn't have optional come_from
+
+2016-10-05  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parser.py, uncompyle6/parsers/parse2.py,
+	uncompyle6/parsers/parse3.py, uncompyle6/scanners/scanner3.py: 
+	Python 3: "and" doesn't have optional come_from
+
+2016-10-05  rocky <rb@dustyfeet.com>
+
+	* : commit d2b477ae7d5a4c081262cabdccdb314d90b39255 Author: rocky
+	<rb@dustyfeet.com> Date:   Tue Oct 4 23:58:35 2016 -0400
+
+2016-09-27  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/looping/04_while1_while1.py,
+	uncompyle6/parsers/parse3.py: Python 3 while1 grammar rules with
+	COME_FROM_LOOP
+
+2016-09-27  rocky <rb@dustyfeet.com>
+
+	* test/Makefile, test/simple_source/looping/04_while1_while1.py,
+	uncompyle6/parser.py, uncompyle6/parsers/parse2.py,
+	uncompyle6/parsers/parse3.py, uncompyle6/scanners/scanner3.py: PY3
+	COME_FROM_LOOP bug There are still more in sre...
+
+2016-09-27  rocky <rb@dustyfeet.com>
+
+	* pytest/test_grammar.py, uncompyle6/parsers/parse3.py,
+	uncompyle6/scanners/scanner3.py: PY3: COME_FROM -> COME_FROM_FINALLY
+	as appropriate We now have all WITH_ op jumps associated in the grammar Also, some COME_FROM_LOOP grammar fixes
+
+2016-09-26  rocky <rb@dustyfeet.com>
+
+	* HISTORY.md, uncompyle6/parser.py, uncompyle6/parsers/parse2.py,
+	uncompyle6/parsers/parse3.py, uncompyle6/scanners/scanner3.py: 
+	Interval order COME_FROMs in Python3 This bug had possibly caused lots of grammar pollution which may
+	need addressing.  We want to process COME_FROMs to the same offset to be in
+	*descending* order so we have the larger range or biggest
+	instruction interval last. (I think they are sorted in increasing
+	order, but for safety we sort them). That way, specific COME_FROM
+	tags will match up properly. For example, a "loop" with an "if"
+	nested in it should have the "loop" tag last so the grammar rule
+	matches that properly Adjust Python 3 grammar for more COME_FROM -> COME_FROM_LOOP. And
+	remove optional COME_FROM_LOOP where possible. Previously, the
+	optional-ness was a result of inner nestings gobbling up the
+	COME_FROM.  We'll probably want to go back and fix this up in Python2.
+
+2016-09-26  rocky <rb@dustyfeet.com>
+
+	* pytest/test_grammar.py, uncompyle6/parsers/parse3.py,
+	uncompyle6/parsers/parse35.py, uncompyle6/scanners/controlflow.py,
+	uncompyle6/scanners/scanner3.py: Python 3 COME_FROM ->
+	COME_FROM_WITH appropriately
+
+2016-09-25  rocky <rb@dustyfeet.com>
+
+	* test/Makefile, uncompyle6/verify.py: Try stronger verification verify.py: add check in verification that magic is the same.
+	Otherwise we go for weak verification.
+
+2016-09-25  rocky <rb@dustyfeet.com>
+
+	* test/Makefile, uncompyle6/parsers/parse3.py: Address whileTrue if
+	cond .. -> while cond ..  bug Reinstate Python standard library bisect test
+
+2016-09-23  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/scanners/scanner3.py: Tidy use of SETUP_ ops Also possibly remove a bug in decompiling Python 3.0 .. 3.2 which
+	doesn't have SETUP_WITH
+
+2016-09-23  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/scanners/scanner3.py: Tidy use of SETUP_ ops Also possibly remove a bug in decompiling Python 3.0 .. 3.2 which
+	doesn't have SETUP_WITH
+
+2016-09-23  rocky <rb@dustyfeet.com>
+
+	* test/Makefile, test/ok_lib3.4/bisect.py: Weaken testing for
+	controlfow branch We have more equivalent programs now
+
+2016-09-22  rocky <rb@dustyfeet.com>
+
+	* pytest/test_grammar.py, pytest/test_single_compile.py,
+	test/Makefile, uncompyle6/parsers/parse3.py,
+	uncompyle6/scanners/scanner3.py: Add COME_FROM_LOOP Note: we have regressed in --verify and some tests, but I believe
+	that's because we are producing more equivalant (if uglier)
+	programs. That's a separate problem though.
+
+2016-09-22  rocky <rb@dustyfeet.com>
+
+	* : commit d271e886d9e818a871f15d8876d6eb9d1ed452a4 Author: rocky
+	<rb@dustyfeet.com> Date:   Thu Sep 22 01:32:00 2016 -0400
+
+2016-09-22  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parser.py, uncompyle6/parsers/parse2.py,
+	uncompyle6/parsers/parse26.py, uncompyle6/parsers/parse27.py,
+	uncompyle6/parsers/parse3.py, uncompyle6/scanners/tok.py: Fix some
+	Test failures Fix py.test pytest/test_grammar.py - Comprehension sorts of things removed from parser that don't exist
+	in earlier pythons scanners/tok.py Add back in "to" when needed
+
+2016-09-21  rocky <rb@dustyfeet.com>
+
+	* pytest/test_grammar.py, uncompyle6/parsers/parse3.py,
+	uncompyle6/scanners/controlflow.py,
+	uncompyle6/scanners/scanner3.py, uncompyle6/scanners/tok.py: First
+	step towards managing control flow decoding
+
+2016-09-21  R. Bernstein <rocky@users.noreply.github.com>
+
+	* : Merge pull request #56 from rocky/fstring merge fstring changes from moagstar
+
+2016-09-21  moagstar <moagstar@gmail.com>
+
+	* pytest/test_fstring.py, uncompyle6/parsers/parse3.py,
+	uncompyle6/semantics/pysource.py: merge fstring changes from
+	moagstar
+
+2016-09-21  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/scanners/scanner2.py, uncompyle6/scanners/scanner26.py: 
+	Python 2 & 3 scanner code ever so slightly closer
+
+2016-09-21  rocky <rb@dustyfeet.com>
+
+	* NEWS: Small NEWS doc typo
+
+2016-09-18  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/scanners/scanner2.py,
+	uncompyle6/scanners/scanner26.py, uncompyle6/semantics/pysource.py: 
+	Small changes
+
+2016-09-11  rocky <rb@dustyfeet.com>
+
+	* ChangeLog, NEWS, __pkginfo__.py, uncompyle6/version.py: Get ready
+	for release 2.8.3
+
+2016-09-11  rocky <rb@dustyfeet.com>
+
+	* test/bytecode_3.6/fstring.py,
+	test/bytecode_3.6/fstring_single.py, uncompyle6/parsers/parse35.py: 
+	Tidy a bit
+
+2016-09-09  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/looping/10_while.py,
+	uncompyle6/parsers/parse3.py: 3.0 .. 3.4 bug in whileTrue
+
+2016-09-09  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/scanners/scanner31.py: 3.1 scanner small fixes
+
+2016-09-09  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/scanners/scanner2.py, uncompyle6/semantics/pysource.py: 
+	ret_cond adjustment for < 2.7 and ...  "<= 2.6" -> "< 2.7" since python 2.6's version is 2.6000001
+
+2016-09-09  rocky <rb@dustyfeet.com>
+
+	* test/Makefile, test/test_pyenvlib.py, test/test_pythonlib.py,
+	uncompyle6/scanners/scanner31.py, uncompyle6/verify.py: Start
+	accepting Python 3.1 bytecode
+
+2016-09-08  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parser.py: Add 3.6 parser
+
+2016-09-08  rocky <rb@dustyfeet.com>
+
+	* .travis.yml, test/Makefile,
+	test/simple_source/expression/06_frozenset.py,
+	test/test_pythonlib.py: More testing - travis:    * 2.7.12 - bump from 2.7.11    * 3.3.6 test_pyenvlib: add --weak-verify to Makefile: check-3.2.6 needs
+	--weak-verify
+
+2016-09-08  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parsers/parse3.py, uncompyle6/semantics/pysource.py: 
+	Python 3.0-3.2 *args processing
+
+2016-09-08  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug32/01_named_and_kwargs.py,
+	uncompyle6/semantics/pysource.py: 3.2 (and down to 3.0?) bug in fn
+	name and kwargs
+
+2016-09-07  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug35/05_return_in_else.py,
+	uncompyle6/scanners/scanner3.py: Another 3.5+ erroneous
+	RETURN_END_IF misclassify
+
+2016-09-07  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug35/05_return_in_else.py,
+	uncompyle6/scanners/scanner3.py: But in Python 3.5+ erroneosly
+	adding RETURN_END_IF
+
+2016-09-05  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug33/02_named_and_kwargs.py,
+	test/test_pyenvlib.py, uncompyle6/parsers/parse3.py,
+	uncompyle6/semantics/pysource.py: Fix 3.3 named bug and ...  Parse 3.4 parameters correctly.  Allow test_pyenvlib to do 3.3.6
+
+2016-09-05  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug33/02_named_and_kwargs.py: Python 3.x bug in
+	getting parameter of ** argument
+
+2016-09-05  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parsers/parse2.py, uncompyle6/parsers/parse26.py,
+	uncompyle6/parsers/parse27.py, uncompyle6/scanners/scanner2.py,
+	uncompyle6/scanners/scanner26.py, uncompyle6/scanners/scanner3.py: 
+	Python 2.6- try/except control flow detection
+
+2016-09-04  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/disas.py, uncompyle6/main.py, uncompyle6/parser.py,
+	uncompyle6/scanner.py, uncompyle6/scanners/scanner2.py,
+	uncompyle6/scanners/scanner22.py, uncompyle6/scanners/scanner26.py,
+	uncompyle6/scanners/scanner27.py, uncompyle6/scanners/scanner3.py,
+	uncompyle6/scanners/scanner32.py, uncompyle6/scanners/scanner33.py,
+	uncompyle6/scanners/scanner34.py, uncompyle6/scanners/scanner35.py,
+	uncompyle6/scanners/scanner36.py, uncompyle6/semantics/aligner.py,
+	uncompyle6/semantics/fragments.py,
+	uncompyle6/semantics/pysource.py, uncompyle6/show.py,
+	uncompyle6/verify.py: disassemble -> ingest where appropriate As part of tokenization for (de)parsing, we need to do something
+	like a disassembly, but is is really a little different.  Disassembly, strictly speaking, is done by the xdis module now.
+	What "ingestion" does is massage the instruction tokens to a form
+	that is more amenable for parsing.  In sum, ingestion is different than disassembly, although
+	disassembly is generally the first part of ingestion.
+
+2016-09-04  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/semantics/pysource.py: Small cleanup/code optimization
+
+2016-09-04  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parsers/parse26.py: Python 2.3--2.6 bug in parsing
+	try-middle Note: it looks like COME_FROMs need to be classified better with
+	respect to whether they are from an except or not we are getting
+	if/else vs except nesting errors.
+
+2016-09-04  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug26/07_generator_return.py,
+	uncompyle6/scanners/scanner2.py, uncompyle6/semantics/pysource.py: A
+	couple more 2.6 (and below) bugs fixed * Detect "return None" inside if statement * another case of triple ==, ==, ==      scanner2.py: detect_structure: descriminate more on parent type
+
+2016-09-03  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug26/05_generator.py,
+	uncompyle6/semantics/pysource.py: Python 2.5-2.6 generator bug Adjust for variable position of list iteration node in a genexpr
+	node
+
+2016-09-03  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/semantics/pysource.py: Python 2.7 "return None" bug Same as 2.3-2.6 "return None".
+
+2016-09-03  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug26/08_triple_equals.py,
+	uncompyle6/scanners/scanner2.py: Python 2.2..2.6 bug in a == b == c
+	== d Fix was to remove some come froms. Feels a little hacky though.
+
+2016-09-03  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug26/07_generator_return.py,
+	uncompyle6/semantics/pysource.py: Python 2.3..2.6 "return" bug In Python 2.6 and possibly down to 2.3 we need to issue "return" not
+	"return None" inside a generator. So check for that "return None"
+	inside n_return and issue "return" for that.
+
+2016-09-03  rocky <rb@dustyfeet.com>
+
+	* DECOMPYLE-2.4-CHANGELOG.txt: Add hartmut Goebel's changes before
+	2.4
+
+2016-09-03  rocky <rb@dustyfeet.com>
+
+	* Makefile, test/simple_source/bug26/04_comp_for.py,
+	uncompyle6/semantics/pysource.py: Fix Python 2.4-2.6 comp_for text
+	generation...  Makefile: tolerate pypy 5.3.x Rest: fix semantic action rule for
+	comp_for and test this
+
+2016-09-02  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug26/06_return_pop.py,
+	uncompyle6/parsers/parse26.py, uncompyle6/scanners/scanner2.py: 
+	Python 2.6- bug: RETURN_ENDIF, POP_TOP ..  POP_TOP should be excluded as a potentional statement beginning
+
+2016-09-02  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug33/02_named_and_kwargs.py,
+	uncompyle6/scanners/scanner2.py, uncompyle6/semantics/pysource.py: 
+	Fix Python 3.x named param and kwargs bug
+
+2016-09-01  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug26/04_while_and_stmt_one_line.py,
+	uncompyle6/scanners/scanner2.py, uncompyle6/scanners/scanner26.py: 
+	2.6- bug: while..and: stmt - on one line If 2.6 or before POP_BLOCK after a JUMP_IF_FALSE does not constitute
+	a new statement. The POP_BLOCK is really part of the JUMP_IF_FALSE.
+	In Python 2.7+ it's a single op.
+
+2016-09-01  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug26/02_except_as.py,
+	uncompyle6/parsers/parse26.py, uncompyle6/semantics/pysource.py: 
+	Handle Python 2.6 and below "except <cond>, <var>"
+
+2016-08-31  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug35/02_fn_varargs.py,
+	uncompyle6/semantics/pysource.py: Python 3.x bug in handling var
+	number of args
+
+2016-08-31  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug33/04_aug_assign.py, test/test_pyenvlib.py,
+	uncompyle6/main.py, uncompyle6/scanners/scanner2.py,
+	uncompyle6/scanners/scanner3.py, uncompyle6/verify.py: Bug in 3.x
+	detecting "if" structure and ...  scanner3.py: bug in 3.x detecting "if" structure Make scanner2.py
+	look more like scanner3.py verify.py: add weak-verify which tests
+	Pytyon syntax, but not code
+
+2016-08-30  rocky <rb@dustyfeet.com>
+
+	* NEWS, test/simple_source/bug26/03_raise_from.py,
+	test/simple_source/bug33/03_raise_from.py,
+	uncompyle6/semantics/pysource.py: Handle Python 2 vs 3 raise syntax
+	change    raise_stmt ::=  "raise" expression "," expression becomes:    raise_stmt ::=  "raise" expression from expression raise expr, expr -> raise
+
+2016-08-29  rocky <rb@dustyfeet.com>
+
+	* ChangeLog, __pkginfo__.py, uncompyle6/version.py: Get ready for
+	release 2.8.2
+
 2016-08-27  rocky <rb@dustyfeet.com>
 
 	* test/test_pyenvlib.py, uncompyle6/verify.py: Correct PYPY bit

DECOMPYLE-2.4-CHANGELOG.txt

@@ -1,4 +1,5 @@
-This is the changelog from *decompyle*'s release 2.4 passed on by Dan Pascu
+This is the changelog from *decompyle*'s release 2.4 and before
+passed on by Dan Pascu
 
 
 release 2.4 (Dan Pascu)
@@ -74,3 +75,57 @@ release 2.2beta1 (hartmut Goebel)
   - use a single Walker and a single Parser, thus saving time and memory
   - use augmented assign and 'print >>' internally
   - optimized 'Walker.engine', the main part of code generation
+release 0.6.0: (hartmut Goebel)
+  - extended print (Python 2.0)
+  - extended import (Python 2.0) (may not cover all cases)
+  - augmented assign (Python 2.0) (may not cover all cases)
+  - list comprehensions (Python 2.0)
+  - equivalent for 'apply' (Python 1.6)
+  - if .. elif .. else are now nested as expected
+  - assert test, data
+  - unpack list corrected (was the same as unpack tuple)
+  - fixed unpack tuple (trailing semicolon was missing)
+  - major speed up :-)
+  - reduced memory usage (pre-alpha-0.5 has increased it a lot)
+  - still missing: EXTENDED_ARG
+
+pre-alpha-0.5: (hartmut Goebel)
+  - *args, **kwargs
+  - global
+  - formal tuple parameters (eg. def a(self, (x,y,z)) )
+  - actual lambda parameters (eg.  X(lambda z: z**2) )
+  - remove last 'return None' in procedures
+  - remove last 'return locals()' in class definitions
+  - docstrings
+
+pre-alpha-0.4: (hartmut Goebel)
+  - assert
+  - try/except/finally
+  - parentheses in expressions
+  - nested expressions
+  - extracted dissassemble() from module dis and
+    removed ugly redirect of stdout, thus saved a lot of
+    ugly code and a lot of memory
+
+pre-alpha-0.3: (hartmut Goebel)
+  - keyword arguments
+  - some boolean expressions
+  - and/or
+  - complex conditions in if/while
+  - read byte-code from .pyc without importing
+  - access to the body of classes and modules
+  - class and function definitions
+  - a = b = c = xxx
+
+pre-alpha-0.1 -> pre-alpha-0.2:
+  -  SET_LINENO filtered out in lexer now
+  -  added support for subscripts (just for Christian Tismer :-)
+  -  fixed bug with handling of BUILD_{LIST,TUPLE} & CALL_FUNCTION
+  -  dict-building support
+  -  comparison support
+  -  exec support
+  -  del support
+  -  pass support
+  -  slice support
+  -  no more extraneous (albeit legal) commas
+  -  finally, it excepts try [sic] but not all 42 variations of it

HISTORY.md

@@ -29,7 +29,9 @@ augmented with pseudo instruction COME_FROM. This code introduced
 another clever idea: using table-driven semantics routines, using
 format specifiers.
 
-The last mention of a release of SPARK from John is around 2002.
+The last mention of a release of SPARK from John is around 2002. As
+released, although the Early Algorithm parser was in good shape, this
+code was woefully lacking as serious Python deparser.
 
 In the fall of 2000, Hartmut Goebel
 [took over maintaining the code](https://groups.google.com/forum/#!searchin/comp.lang.python/hartmut$20goebel/comp.lang.python/35s3mp4-nuY/UZALti6ujnQJ). The
@@ -112,12 +114,18 @@ 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+.
+3.2+. In doing so, it has been expedient to separate this into three
+projects: load loading and disassembly (xdis), parsing and tree
+building (spark_parser), and grammar and semantic actions for
+decompiling (uncompyle6).
+
 
 Over the many years, code styles and Python features have
 changed. However brilliant the code was and still is, it hasn't really
 had a single public active maintainer. And there have been many forks
-of the code.
+of the code.  I have spent a great deal of time trying to organize and
+modularize the code so that it can handle more Python versions more
+gracefully (with still only moderate success).
 
 That it has been in need of an overhaul has been recognized by the
 Hartmut a decade an a half ago:

Makefile

@@ -42,7 +42,7 @@ check-2.6:
 
 #:PyPy 2.6.1 or PyPy 5.0.1
 # Skip for now
-2.6 5.0:
+2.6 5.0 5.3:
 
 #:PyPy pypy3-2.4.0 Python 3:
 pypy-3.2 2.4:

NEWS

@@ -1,3 +1,56 @@
+uncompyle6 2.9.0 2016-10-09
+
+- Use xdis 3.0.0 protocol load_module.
+  this Forces change in requirements.txt and _pkg_info_.py
+- Start Python 1.5 decompiling; another round of work is needed to
+  remove bugs
+- Simpify python 2.1 grammar
+- Fix bug with -t ...  Wasn't showing source text when -t option was given
+- Fix 2.1-2.6 bug in list comprehension
+
+uncompyle6 2.8.4 2016-10-08
+
+- Python 3 disassembly bug fixes
+- Python 3.6 fstring bug fixes (from moagstar)
+- Python 2.1 disassembly
+- COME_FROM suffixes added in Python3
+- use .py extension in verification disassembly
+
+uncompyle6 2.8.3 2016-09-11 live from NYC!
+
+NOTE: this is possibly the last release before a major reworking of
+control-flow structure detection is done.
+
+- Lots of bug fixes in decompilation:
+  * 3.0 .. 3.4 whileTrue bug
+  * 3.x function declaration deparsing:
+    . 3.0 .. 3.2 *args processing
+    . 3.0 .. 3.2 call name and kwargs bug
+    . 3.0 .. getting parameter of *
+    . 3.0 .. handling varible number of args
+    . 3.0 .. "if" structure bugs
+  * 3.5+ if/else bugs
+  * 2.2-2.6 bugs
+    . try/except control flow
+    . a == b == c -like detection
+    . generator detection
+    . "while .. and" statement bugs
+    . handle "except <cond>, <var>"
+    . use older raise format in 2.x
+- scanner "disassemble" is now "ingest". True disassembly is done by xdis
+- Start accepting Python 3.1 bytecode
+- Add --weak-verify option on test_pyenvlib and test_pythonlib. This
+  catches more bugs more easily
+- bump xdis requirement so we can deparse dropbox 2.5 code
+- Added H. Goebel's changes before 2.4 in DECOMPYLE-2.4-CHANGELOG.txt
+
+uncompyle6 2.8.2 2016-08-29
+
+- Handle Python 3.6 format string conversions !r, !s, !a
+- Start to handle 3.1 bytecode
+- Fix some PyPy translation bugs
+- We now only handle 3.6.0a3+ since that is incompatible with 3.6 before that
+
 uncompyle6 2.8.1 2016-08-20
 
 - Add Python 2.2 decompilation

README.rst

@@ -11,8 +11,8 @@ Introduction
 ------------
 
 *uncompyle6* translates Python bytecode back into equivalent Python
-source code. It accepts bytecodes from Python version 2.2 to 3.6 or
-so, including PyPy bytecode.
+source code. It accepts bytecodes from Python version 2.1 to 3.6 or
+so, including PyPy bytecode and Dropbox's Python 2.5 bytecode.
 
 Why this?
 ---------
@@ -45,7 +45,7 @@ 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.2-2.7, and 3.2-3.6 and the above-mentioned PyPy versions.
+versions 2.1-2.7, and 3.2-3.6 and the above-mentioned PyPy versions.
 
 Installation
 ------------

__pkginfo__.py

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

pytest/test_fstring.py

@@ -87,19 +87,23 @@ def fstrings(draw):
 
     :return: A valid f-string.
     """
+    character_strategy = st.characters(
+        blacklist_characters='\r\n\'\\s{}',
+        min_codepoint=1,
+        max_codepoint=1000,
+    )
     is_raw = draw(st.booleans())
     integer_strategy = st.integers(min_value=0, max_value=3)
     expression_count = draw(integer_strategy)
     content = []
     for _ in range(expression_count):
         expression = draw(expressions())
-        # not yet : conversion not supported
-        conversion = ''#draw(st.sampled_from(('', '!s', '!r', '!a',)))
+        conversion = draw(st.sampled_from(('', '!s', '!r', '!a',)))
         has_specifier = draw(st.booleans())
         specifier = ':' + draw(format_specifiers()) if has_specifier else ''
         content.append('{{{}{}}}'.format(expression, conversion, specifier))
+        content.append(draw(st.text(character_strategy)))
     content = ''.join(content)
-
     return "f{}'{}'".format('r' if is_raw else '', content)
 
 
@@ -114,23 +118,27 @@ def test_format_specifiers(format_specifier):
             raise
 
 
+def run_test(text):
+    expr = text + '\n'
+    code = compile(expr, '<string>', 'single')
+    deparsed = deparse_code(PYTHON_VERSION, code, compile_mode='single')
+    recompiled = compile(deparsed.text, '<string>', 'single')
+    if recompiled != code:
+        assert 'dis(' + deparsed.text.strip('\n') + ')' == 'dis(' + expr.strip('\n') + ')'
+
+
 @pytest.mark.skipif(PYTHON_VERSION < 3.6, reason='need at least python 3.6')
 @hypothesis.given(fstrings())
 def test_uncompyle_fstring(fstring):
     """Verify uncompyling fstring bytecode"""
+    run_test(fstring)
 
-    # ignore fstring with no expressions an fsring with
-    # no expressions just gets compiled to a normal string.
-    hypothesis.assume('{' in fstring)
 
-    # BUG : At the moment a single expression is not supported
-    # for example f'{abc}'.
-    hypothesis.assume(fstring.count('{') > 1)
-
-    expr = fstring + '\n'
-    code = compile(expr, '<string>', 'single')
-    deparsed = deparse_code(PYTHON_VERSION, code, compile_mode='single')
-    recompiled = compile(deparsed.text, '<string>', 'single')
-
-    if recompiled != code:
-        assert deparsed.text == expr
+@pytest.mark.skipif(PYTHON_VERSION < 3.6, reason='need at least python 3.6')
+@pytest.mark.parametrize('fstring', [
+    #"f'{abc}{abc!s}'",
+    "f'{abc!s}'",
+])
+def test_uncompyle_direct(fstring):
+    """useful for debugging"""
+    run_test(fstring)

pytest/test_grammar.py

@@ -31,9 +31,12 @@ def test_grammar():
     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
+            """
+            JUMP_BACK CONTINUE RETURN_END_IF
+            COME_FROM COME_FROM_EXCEPT COME_FROM_LOOP COME_FROM_WITH
+            COME_FROM_FINALLY
+            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)

pytest/test_single_compile.py

@@ -9,8 +9,6 @@ def test_single_mode():
         'i = j % 4',
         'i = {}',
         'i = []',
-        'while i < 1 or stop:\n    i\n',
-        'while i < 1 or stop:\n    print%s\n' % ('(i)' if PYTHON3 else ' i'),
         'for i in range(10):\n    i\n',
         'for i in range(10):\n    for j in range(10):\n        i + j\n',
         'try:\n    i\nexcept Exception:\n    j\nelse:\n    k\n'

requirements.txt

@@ -1,2 +1,2 @@
 spark-parser >= 1.4.0
-xdis >= 2.2.2
+xdis >= 3.0.0

test/Makefile

@@ -23,20 +23,20 @@ check:
 check-2.6 check-2.7: check-bytecode-2 check-bytecode-3  check-2.7-ok
 
 #: Run working tests from Python 3.1
-check-3.2: check-bytecode
-	$(PYTHON) test_pythonlib.py --bytecode-3.1 --verify $(COMPILE)
+check-3.1: check-bytecode
+	$(PYTHON) test_pythonlib.py --bytecode-3.1 --weak-verify $(COMPILE)
 
 #: Run working tests from Python 3.2
 check-3.2: check-bytecode
-	$(PYTHON) test_pythonlib.py --bytecode-3.2 --verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --bytecode-3.2 --weak-verify $(COMPILE)
 
 #: Run working tests from Python 3.3
 check-3.3: check-bytecode
-	$(PYTHON) test_pythonlib.py --bytecode-3.3 --verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --bytecode-3.3 --weak-verify $(COMPILE)
 
 #: 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)
+	$(PYTHON) test_pythonlib.py --bytecode-3.4 --weak-verify $(COMPILE)
 
 #: Run working tests from Python 3.5
 check-3.5: check-bytecode
@@ -53,7 +53,7 @@ check-disasm:
 #: Check deparsing bytecode 2.x only
 check-bytecode-2:
 	$(PYTHON) test_pythonlib.py \
-	--bytecode-2.2 --bytecode-2.3 --bytecode-2.4 \
+	--bytecode-2.1 --bytecode-2.2 --bytecode-2.3 --bytecode-2.4 \
         --bytecode-2.5 --bytecode-2.6 --bytecode-2.7 --bytecode-pypy2.7
 
 #: Check deparsing bytecode 3.x only
@@ -64,11 +64,15 @@ check-bytecode-3:
 #: Check deparsing bytecode that works running Python 2 and Python 3
 check-bytecode: check-bytecode-3
 	$(PYTHON) test_pythonlib.py \
-	--bytecode-2.2 --bytecode-2.3 --bytecode-2.4 \
+	--bytecode-2.1 --bytecode-2.2 --bytecode-2.3 --bytecode-2.4 \
         --bytecode-2.5 --bytecode-2.6 --bytecode-2.7 --bytecode-pypy2.7
 
+#: Check deparsing Python 2.1
+check-bytecode-2.1:
+	$(PYTHON) test_pythonlib.py --bytecode-2.1
+
 #: Check deparsing Python 2.2
-check-bytecode-2.3:
+check-bytecode-2.2:
 	$(PYTHON) test_pythonlib.py --bytecode-2.2
 
 #: Check deparsing Python 2.3
@@ -91,6 +95,10 @@ check-bytecode-2.6:
 check-bytecode-2.7:
 	$(PYTHON) test_pythonlib.py --bytecode-2.7
 
+#: Check deparsing Python 3.1
+check-bytecode-3.1:
+	$(PYTHON) test_pythonlib.py --bytecode-3.1
+
 #: Check deparsing Python 3.2
 check-bytecode-3.2:
 	$(PYTHON) test_pythonlib.py --bytecode-3.2