xdis "is not" is now "is-not"

Get ready for release 2.11.3
Merge branch 'master' into python-2.4
2025-08-04 01:09:52 +08:00 · 2017-08-09 22:07:32 -04:00 · 2017-08-09 21:46:27 -04:00 · 2017-08-09 21:45:50 -04:00 · 2017-08-09 21:33:01 -04:00 · 2017-08-03 03:48:57 -04:00
68 changed files with 840 additions and 769 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,7 @@ language: python
 sudo: false

 python:
-  - '3.5'
-  - '2.7.12'
-  - '2.6'
-  - '3.3'
-  - '3.4'
-  - '3.2'
-  - '3.6'
+  - '2.7' # this is a cheat here because travis doesn't do 2.4-2.6

 install:
 - pip install -e .
--- a/359
+++ b/359
@@ -1,3 +1,103 @@
+2017-08-09  rocky <rb@dustyfeet.com>
+
+	* : commit dc627d13b8455ded4bf708a596bb466f9df9bf7b Author: rocky
+	<rb@dustyfeet.com> Date:   Wed Aug 9 21:19:30 2017 -0400
+
+2017-08-03  rocky <rb@dustyfeet.com>
+
+	* pytest/test_deparse.py, pytest/test_docstring.py,
+	pytest/test_fjt.py, pytest/test_single_compile.py,
+	pytest/validate.py, uncompyle6/scanners/scanner3.py,
+	uncompyle6/scanners/scanner30.py: Python 2.4 comptiability and ...  exception match -> exception-match
+
+2017-08-02  rocky <rb@dustyfeet.com>
+
+	* __pkginfo__.py: Bump xdis
+
+2017-08-02  rocky <rb@dustyfeet.com>
+
+	* __pkginfo__.py: Remove six from python 2.4/2.5
+
+2017-08-02  rocky <rb@dustyfeet.com>
+
+	* __pkginfo__.py: Revert commit to wrong branch
+
+2017-08-02  rocky <rb@dustyfeet.com>
+
+	* __pkginfo__.py: Remove six from Python-2.4/2.5 package
+
+2017-08-01  rocky <rb@dustyfeet.com>
+
+	* pytest/validate.py, test/dis-compare.py,
+	test/simple-uncompyle-code-test.py: Python 2.4 compatibility
+
+2017-07-17  rocky <rb@dustyfeet.com>
+
+	* __pkginfo__.py, uncompyle6/scanners/scanner2.py,
+	uncompyle6/scanners/scanner3.py, uncompyle6/scanners/scanner30.py: 
+	xdis's "exception match" is now "exception-match"
+
+2017-07-15  rocky <rb@dustyfeet.com>
+
+	* __pkginfo__.py: xdis 3.5.1 is botched?
+
+2017-07-14  rocky <rb@dustyfeet.com>
+
+	* __pkginfo__.py: Use newer xdis
+
+2017-07-14  R. Bernstein <rocky@users.noreply.github.com>
+
+	* README.rst: Fixes issue #124
+
+2017-07-14  rocky <rb@dustyfeet.com>
+
+	* HISTORY.md: History updates
+
+2017-07-09  rocky <rb@dustyfeet.com>
+
+	* README.rst: RsT doc formatting
+
+2017-07-09  rocky <rb@dustyfeet.com>
+
+	* ChangeLog, HOW-TO-REPORT-A-BUG.md, NEWS, uncompyle6/version.py: 
+	Get ready for release 2.11.2
+
+2017-07-08  rocky <rb@dustyfeet.com>
+
+	* __pkginfo__.py, uncompyle6/scanner.py,
+	uncompyle6/scanners/scanner2.py, uncompyle6/scanners/scanner26.py,
+	uncompyle6/scanners/scanner3.py, uncompyle6/scanners/scanner30.py,
+	uncompyle6/scanners/tok.py: Use xdis 3.5.0's opcode sets
+
+2017-07-08  rocky <rb@dustyfeet.com>
+
+	* test/test_pyenvlib.py, uncompyle6/scanners/pypy32.py,
+	uncompyle6/scanners/pypy35.py, uncompyle6/scanners/scanner15.py,
+	uncompyle6/scanners/scanner32.py, uncompyle6/scanners/scanner34.py,
+	uncompyle6/scanners/scanner35.py, uncompyle6/scanners/scanner36.py: 
+	Start supporting Pypy 3.5 (5.7.1-beta)
+
+2017-07-05  rocky <rb@dustyfeet.com>
+
+	* test/simple_source/bug26/03_loop_if_cf.py,
+	uncompyle6/parsers/parse26.py: Loops in Python 2.4-2.6 loop
+	come_from Looks like Python 2.4-2.6 may have a COME_FROM(_LOOP) before the
+	jump_back.  Fixes Issue #123
+
+2017-06-29  rocky <rb@dustyfeet.com>
+
+	* : Work around not having real flow-control analysis
+
+2017-06-28  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/semantics/make_function.py: A guard against badly
+	formated bytecode
+
+2017-06-25  rocky <rb@dustyfeet.com>
+
+	* : commit 9c072a6a423d8379712296dbcd499c772ba7ef59 Author: rocky
+	<rb@dustyfeet.com> Date:   Sun Jun 25 18:44:50 2017 -0400
+
 2017-06-25  rocky <rb@dustyfeet.com>

 	* uncompyle6/version.py: Get ready for release 2.11.1
@@ -21,8 +121,14 @@

 2017-06-18  rocky <rb@dustyfeet.com>

-	* ChangeLog, NEWS, uncompyle6/version.py: Get ready for release
-	2.11.0
+	* uncompyle6/scanners/scanner2.py, uncompyle6/scanners/scanner3.py,
+	uncompyle6/semantics/fragments.py,
+	uncompyle6/semantics/make_function.py: More merge fixups from master
+
+2017-06-18  rocky <rb@dustyfeet.com>
+
+	* : commit af10f99776b142c44fb4507033fb3220b5f57910 Author: rocky
+	<rb@dustyfeet.com> Date:   Sun Jun 18 15:22:27 2017 -0400

 2017-06-13  rocky <rb@dustyfeet.com>

@@ -117,7 +223,20 @@

 2017-06-03  rocky <rb@dustyfeet.com>

-	* .travis.yml: Streamline .travis.yml a little bit
+	* pytest/validate.py: 2.4 doesn't do six
+
+2017-06-03  rocky <rb@dustyfeet.com>
+
+	* appveyor.yml: Nope it (appveyor) doesn't.
+
+2017-06-03  rocky <rb@dustyfeet.com>
+
+	* __pkginfo__.py, appveyor.yml: Administrivia See if appveyor will handle 2.5
+
+2017-06-03  rocky <rb@dustyfeet.com>
+
+	* : commit 7c299fbf3777c452d6a10075964961783f510699 Author: rocky
+	<rb@dustyfeet.com> Date:   Sat Jun 3 05:38:05 2017 -0400

 2017-06-03  rocky <rb@dustyfeet.com>

@@ -144,8 +263,12 @@

 2017-05-30  rocky <rb@dustyfeet.com>

-	* ChangeLog, NEWS, uncompyle6/version.py: Get ready for release
-	2.10.0
+	* pytest/test_function_call.py: No decorators in Python < 2.6
+
+2017-05-30  rocky <rb@dustyfeet.com>
+
+	* : commit ad98fae3d4b0b83f65b15da8201e33c0ee6dab17 Author: rocky
+	<rb@dustyfeet.com> Date:   Tue May 30 01:26:52 2017 -0400

 2017-05-30  rocky <rb@dustyfeet.com>

@@ -384,15 +507,25 @@
 	* ChangeLog, NEWS, uncompyle6/version.py: Get ready for release
 	2.9.11

+2017-05-06  rocky <rb@dustyfeet.com>
+
+	* ChangeLog, NEWS, uncompyle6/version.py: Get ready for release
+	2.9.11
+
 2017-05-06  rocky <rb@dustyfeet.com>

 	* test/Makefile: fix PYTHON variable setting in test/Makefile

 2017-05-06  rocky <rb@dustyfeet.com>

-	* test/simple_source/bug32/01_try_except_raise.py,
-	test/simple_source/bug32/03_if.py, uncompyle6/parsers/parse32.py,
-	uncompyle6/parsers/parse33.py: Fix more Python3.2 parser errors
+	* test/Makefile, uncompyle6/scanners/scanner2.py,
+	uncompyle6/scanners/scanner3.py, uncompyle6/semantics/fragments.py: 
+	Sync with master
+
+2017-05-06  rocky <rb@dustyfeet.com>
+
+	* : commit 4a4782290490187ac2fcaaecd3ca808f933722b2 Author: rocky
+	<rb@dustyfeet.com> Date:   Sat May 6 05:25:56 2017 -0400

 2017-05-05  rocky <rb@dustyfeet.com>

@@ -580,6 +713,11 @@
 	haphazard way using real flow-control analysis. Hopefully that's on
 	the way.  In the meantime we have this hack.

+2017-04-14  rocky <rb@dustyfeet.com>
+
+	* : commit 7e8f7ba67431725fceec08344934c929a517efc5 Author: rocky
+	<rb@dustyfeet.com> Date:   Fri Apr 14 05:42:44 2017 -0400
+
 2017-04-14  rocky <rb@dustyfeet.com>

 	* test/simple_source/bug27+/03_if_1_else.py,
@@ -644,9 +782,10 @@
 	uncompyle6/parsers/parse2.py, uncompyle6/parsers/parse3.py,
 	uncompyle6/parsers/parse35.py: Add more while1else grammar rules Towards addressing issue #93

-2017-04-09  rocky <rb@dustyfeet.com>
+2017-04-10  rocky <rb@dustyfeet.com>

-	* : One more FUNCTION_VAR test for 3.3
+	* : commit b9703cf6b41138b717c282fc791c08d807692b07 Author: rocky
+	<rb@dustyfeet.com> Date:   Sun Apr 9 06:58:41 2017 -0400

 2017-04-09  rocky <rb@dustyfeet.com>

@@ -757,11 +896,8 @@

 2017-03-01  rocky <rb@dustyfeet.com>

-	* uncompyle6/scanner.py, uncompyle6/scanners/scanner2.py,
-	uncompyle6/scanners/scanner3.py, uncompyle6/verify.py: COME_FROM for
-	3.x POP_EXCEPT, DRY with op_name() ...  Start adding COME_FROMs for POP_EXCEPT in preparation for getting
-	tryelse blocks correct.  Simpler opname access functions:   - self.op_name(op) is self.opc.opname[op]   - self.op_name_from_offset(offset) is
-	  self.opc.opname[self.code[offset]] verify.py: not all offsets are ints
+	* : commit 160ec0d9cc5fe347f6e8bdb69515a28c76cfb368 Author: rocky
+	<rb@dustyfeet.com> Date:   Wed Mar 1 05:50:31 2017 -0500

 2017-02-28  rocky <rb@dustyfeet.com>

@@ -785,13 +921,17 @@

 2017-02-25  rocky <rb@dustyfeet.com>

-	* ChangeLog, NEWS, __pkginfo__.py, uncompyle6/version.py: Get ready
-	for release 2.9.10
+	* : commit 1e3ea60055027dfd3f098661ac4f5979c5c48f7e Author: rocky
+	<rb@dustyfeet.com> Date:   Sat Feb 25 20:18:03 2017 -0500

 2017-02-25  rocky <rb@dustyfeet.com>

-	* uncompyle6/parser.py, uncompyle6/parsers/parse26.py: Python 2.6
-	parsing bugs ..  and some parser list nonterminal cleanup
+	* uncompyle6/parser.py: Python <= 2.6 grammar fixes
+
+2017-02-25  rocky <rb@dustyfeet.com>
+
+	* : commit 2fbbc728b10f0d3a754165708584bd80d33bc7f9 Author: rocky
+	<rb@dustyfeet.com> Date:   Sat Feb 25 04:45:10 2017 -0500

 2017-02-24  rocky <rb@dustyfeet.com>

@@ -805,9 +945,15 @@
 	uncompyle6/parsers/parse25.py: Python 2.5 wasn't handling tryelse
 	properly

-2017-02-20  rocky <rb@dustyfeet.com>
+2017-02-22  rocky <rb@dustyfeet.com>

-	* : New test doesn't --verify correctly. Sigh.
+	* test/Makefile, test/simple_source/bug25/02_try_else.py,
+	uncompyle6/parsers/parse25.py: Python 2.5 was missing try else stmt
+
+2017-02-22  rocky <rb@dustyfeet.com>
+
+	* : commit b043f6bafc9b9ae26e64dc0f1441d7abae894c37 Author: rocky
+	<rb@dustyfeet.com> Date:   Mon Feb 20 09:22:01 2017 -0500

 2017-02-20  rocky <rb@dustyfeet.com>

@@ -846,6 +992,10 @@
 	* test/simple_source/bug22/01_ops.py, test/test_pythonlib.py: Beef
 	up grammar coverage

+2017-02-10  rocky <rb@dustyfeet.com>
+
+	* test/Makefile: Group coverage Makefile targets
+
 2017-01-29  rocky <rb@dustyfeet.com>

 	* test/Makefile, test/simple_source/bug22/01_ops.py,
@@ -853,9 +1003,24 @@
 	uncompyle6/semantics/pysource.py: Changes based on grammar coverage
 	info

-2017-01-29  R. Bernstein <rocky@users.noreply.github.com>
+2017-01-29  rocky <rb@dustyfeet.com>

-	* : Merge pull request #83 from rocky/coverage Coverage
+	* test/Makefile, test/simple_source/bug22/01_ops.py,
+	uncompyle6/parsers/parse25.py, uncompyle6/semantics/consts.py,
+	uncompyle6/semantics/pysource.py: Changes based on coverage
+	information
+
+2017-01-29  rocky <rb@dustyfeet.com>
+
+	* : commit 9348411056cbe809e07c4ef341effa17bca90e2f Merge: 3dc766d
+	e71dd01 Author: R. Bernstein <rocky@users.noreply.github.com> Date:
+	Sun Jan 29 21:54:45 2017 -0500
+
+2017-01-29  rocky <rb@dustyfeet.com>
+
+	* test/Makefile, test/simple_source/bug22/01_ops.py,
+	test/test_pyenvlib.py, test/test_pythonlib.py,
+	uncompyle6/semantics/consts.py: Simplfy getting coverage consts.py: notes on versions use which ops

 2017-01-29  rocky <rb@dustyfeet.com>

@@ -959,6 +1124,10 @@
 	* uncompyle6/__init__.py: sys.recursionlimit is optional, not
 	essential

+2017-01-11  rocky <rb@dustyfeet.com>
+
+	* NEWS, uncompyle6/version.py: Get ready for release 2.9.9
+
 2017-01-11  rocky <rb@dustyfeet.com>

 	* : commit b131c20e99514d3a969a51e841d3a823017f1beb Author: rocky
@@ -968,9 +1137,22 @@

 	* ChangeLog, NEWS: Get ready for release 2.10.9

+2017-01-11  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parsers/parse3.py, uncompyle6/scanner.py,
+	uncompyle6/semantics/make_function.py, uncompyle6/version.py: Merge
+	changes ...  * str() in Python 2.4 doesn't detect unicode.  * index() doesn't work on tuples * ifelse change
+
+2017-01-11  rocky <rb@dustyfeet.com>
+
+	* : commit 7ece296f7638e71fad1117b940f7ffddbe095b1f Merge: 78a5b62
+	5035d54 Author: R. Bernstein <rocky@users.noreply.github.com> Date:
+	Wed Jan 11 07:10:23 2017 -0500
+
 2017-01-11  R. Bernstein <rocky@users.noreply.github.com>

-	* : Merge pull request #79 from rocky/revert-78-patch-1 Revert "fix bug : not generate all files when use "-ro""
+	* uncompyle6/main.py: Revert "fix bug : not generate all files when
+	use "-ro""

 2017-01-11  R. Bernstein <rocky@users.noreply.github.com>

@@ -1069,6 +1251,16 @@
 	* uncompyle6/parsers/parse35.py, uncompyle6/scanners/scanner3.py: 
 	Python 3.5 continue detection bug

+2017-01-02  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/verify.py: 2.4 verify hacks
+
+2017-01-02  rocky <rb@dustyfeet.com>
+
+	* : commit a7d93e88b4e0dfd6876a7a31bd201a0e40f24bea Merge: 9891494
+	136f42a Author: rocky <rb@dustyfeet.com> Date:   Mon Jan 2 05:39:13
+	2017 -0500
+
 2017-01-01  rocky <rb@dustyfeet.com>

 	* uncompyle6/scanners/scanner3.py: add come_from for setup_finally
@@ -1083,6 +1275,14 @@

 	* README.rst: Note how to verify correctness ...  with --verify, --weak-verify and cross checking with pycdc

+2016-12-31  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/version.py: We are version 2.9.9
+
+2016-12-31  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/main.py: 2.7->2.4 conversion
+
 2016-12-31  rocky <rb@dustyfeet.com>

 	* ChangeLog, NEWS, uncompyle6/version.py: Get ready for release
@@ -1092,6 +1292,13 @@

 	* uncompyle6/parsers/parse26.py: 2.x list_if may have a THEN in it

+2016-12-31  rocky <rb@dustyfeet.com>
+
+	* test/Makefile, uncompyle6/main.py, uncompyle6/parsers/parse26.py,
+	uncompyle6/scanners/scanner2.py, uncompyle6/scanners/scanner26.py,
+	uncompyle6/scanners/scanner3.py, uncompyle6/semantics/pysource.py,
+	uncompyle6/verify.py: Merge master branche Handle 2.2 list_if
+
 2016-12-31  rocky <rb@dustyfeet.com>

 	* uncompyle6/scanners/scanner3.py: Towards fixing a Python 3.3
@@ -1120,10 +1327,9 @@

 	* : Merge pull request #73 from rocky/then-crap Add THEN token to improve Python 2.2-2.6 control flow detection

-2016-12-28  rocky <rb@dustyfeet.com>
+2016-12-29  R. Bernstein <rocky@users.noreply.github.com>

-	* uncompyle6/parsers/parse3.py, uncompyle6/scanners/tok.py: Misc
-	bugs
+	* : Merge pull request #72 from rocky/master THEN psuedo-ops for Python 2.x

 2016-12-28  rocky <rb@dustyfeet.com>

@@ -1150,8 +1356,7 @@

 2016-12-27  rocky <rb@dustyfeet.com>

-	* uncompyle6/scanners/scanner2.py: Make 2.6 and 2.7 ingest more
-	alike
+	* : Merge commit '9b1dd0f' into python-2.4

 2016-12-26  rocky <rb@dustyfeet.com>

@@ -1171,6 +1376,11 @@
 	* uncompyle6/parsers/parse25.py: fix bug in using python2 AST rules
 	in python 2.5

+2016-12-26  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parsers/parse25.py: Bug in using python2 ast checking
+	in python 2.5
+
 2016-12-26  rocky <rb@dustyfeet.com>

 	* : commit f1a947f106b231fb1480ba301b15e3ceaf78c94f Author: rocky
@@ -1183,15 +1393,19 @@
 	uncompyle6/verify.py: Scanner call fixes. NAME_MODULE removal for
 	<=2.4

-2016-12-24  rocky <rb@dustyfeet.com>
+2016-12-25  rocky <rb@dustyfeet.com>

-	* uncompyle6/parsers/astnode.py, uncompyle6/parsers/parse2.py,
-	uncompyle6/parsers/parse26.py, uncompyle6/parsers/parse3.py,
-	uncompyle6/parsers/parse36.py, uncompyle6/scanners/scanner15.py,
-	uncompyle6/scanners/scanner2.py, uncompyle6/scanners/scanner21.py,
-	uncompyle6/scanners/scanner22.py,
-	uncompyle6/semantics/fragments.py, uncompyle6/semantics/pysource.py: 
-	Lint
+	* uncompyle6/main.py, uncompyle6/scanners/scanner15.py,
+	uncompyle6/scanners/scanner21.py, uncompyle6/scanners/scanner22.py,
+	uncompyle6/scanners/scanner23.py, uncompyle6/scanners/scanner24.py,
+	uncompyle6/semantics/pysource.py, uncompyle6/verify.py: Removing
+	NAME_MODULE, lint and bug fixes scanner*.py: show_asm param is optional verify.py: call correct
+	scanners main.py, verify.py: Use older Python print statements
+
+2016-12-25  rocky <rb@dustyfeet.com>
+
+	* : commit e3f4beeb74e33d5b404094765cc63040f62a0b41 Author: rocky
+	<rb@dustyfeet.com> Date:   Sat Dec 24 07:45:02 2016 -0500

 2016-12-24  rocky <rb@dustyfeet.com>

@@ -1212,22 +1426,34 @@

 2016-12-18  rocky <rb@dustyfeet.com>

-	* pytest/.gitignore, test/simple_source/bug25/02_try_else.py,
-	uncompyle6/parsers/parse25.py, uncompyle6/parsers/parse26.py: Python
-	2.5 mistaken try/else
+	* : commit c7c0a989829a9a625333665516387c1177c611c2 Author: rocky
+	<rb@dustyfeet.com> Date:   Sun Dec 18 00:56:07 2016 -0500

 2016-12-17  rocky <rb@dustyfeet.com>

 	* uncompyle6/scanners/scanner2.py, uncompyle6/scanners/scanner25.py: 
 	show-asm on python2.5 is optional make scanner2 look a little more like scanner3

+2016-12-17  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/scanners/scanner2.py, uncompyle6/scanners/scanner25.py: 
+	show-asm on python2.5 is optional Make scanner2 a little more like scanner3.
+
+2016-12-17  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parser.py, uncompyle6/scanner.py,
+	uncompyle6/scanners/scanner2.py, uncompyle6/scanners/scanner3.py,
+	uncompyle6/semantics/fragments.py: Python 2.6/2.7 tolerance in
+	Python 2.4 branch
+
 2016-12-16  rocky <rb@dustyfeet.com>

 	* NEWS: Release 2.9.8 news

 2016-12-16  rocky <rb@dustyfeet.com>

-	* __pkginfo__.py, uncompyle6/version.py: Get ready for release 2.9.8
+	* : commit 13d5cd1a588b7f4f2c233c436ce6b0b39db9950e Author: rocky
+	<rb@dustyfeet.com> Date:   Fri Dec 16 22:42:46 2016 -0500

 2016-12-16  rocky <rb@dustyfeet.com>

@@ -1295,15 +1521,12 @@

 2016-12-04  rocky <rb@dustyfeet.com>

-	* ChangeLog, NEWS, uncompyle6/main.py, uncompyle6/parser.py,
-	uncompyle6/parsers/parse26.py, uncompyle6/parsers/parse3.py,
-	uncompyle6/parsers/parse34.py, uncompyle6/parsers/parse35.py,
-	uncompyle6/scanner.py, uncompyle6/scanners/scanner2.py,
-	uncompyle6/scanners/scanner23.py, uncompyle6/scanners/scanner24.py,
-	uncompyle6/scanners/scanner3.py, uncompyle6/scanners/tok.py,
-	uncompyle6/semantics/make_function.py,
-	uncompyle6/semantics/pysource.py, uncompyle6/verify.py,
-	uncompyle6/version.py: Get ready for release 2.9.7 Some of the many lint things. Linting is kind of stupid though.
+	* ChangeLog: Get ready for release 2.9.7
+
+2016-12-04  rocky <rb@dustyfeet.com>
+
+	* : commit d22931cb49f0e28a0fbe48a7c1526b1f170a5b52 Author: rocky
+	<rb@dustyfeet.com> Date:   Sun Dec 4 07:31:34 2016 -0500

 2016-11-28  rocky <rb@dustyfeet.com>

@@ -1354,11 +1577,34 @@
 	* uncompyle6/semantics/pysource.py: Better line number tracking Indent Python 2 list comprehensions, albeit badly.  DRY code a
 	little via indent_if_source_nl

+2016-11-24  rocky <rb@dustyfeet.com>
+
+	* circle.yml: CircleCI build
+
+2016-11-24  rocky <rb@dustyfeet.com>
+
+	* uncompyle6/parsers/parse3.py: Remove dup Python 3 grammar rule
+
 2016-11-24  rocky <rb@dustyfeet.com>

 	* uncompyle6/parsers/parse3.py, uncompyle6/scanners/scanner2.py: 
 	<2.7 "if" detection and dup Python 3 grammar rule

+2016-11-24  rocky <rb@dustyfeet.com>
+
+	* test/test_pyenvlib.py, uncompyle6/linenumbers.py,
+	uncompyle6/main.py, uncompyle6/scanners/scanner2.py,
+	uncompyle6/semantics/make_function.py,
+	uncompyle6/semantics/pysource.py, uncompyle6/verify.py: Bug in 2.4
+	"if" dectection and...  Wrong language used in old-style exceptions: use "except Error,e"
+	not "except Error(e)""
+
+2016-11-24  rocky <rb@dustyfeet.com>
+
+	* __pkginfo__.py, pytest/test_grammar.py, uncompyle6/parser.py,
+	uncompyle6/parsers/parse26.py:  Python 2.6 grammary bug and..  __pkginfo.py__: Bump spark_parser
+	version for parse_flags 'dups'
+
 2016-11-23  rocky <rb@dustyfeet.com>

 	* __pkginfo__.py, pytest/test_grammar.py, uncompyle6/parser.py,
@@ -1370,8 +1616,17 @@

 2016-11-23  rocky <rb@dustyfeet.com>

-	* : commit 6aa1531972de83ecab15b4c96b89c873ea5a7458 Author: rocky
-	<rb@dustyfeet.com> Date:   Wed Nov 23 00:48:38 2016 -0500
+	* : commit 7133540c235e16f02d2db62cb903b70aa311de20 Author: rocky
+	<rb@dustyfeet.com> Date:   Wed Nov 23 08:26:12 2016 -0500
+
+2016-11-23  rocky <rb@dustyfeet.com>
+
+	* : commit a9349b8f3d12b2aa0cd88286617c1af9cccad018 Author: rocky
+	<rb@dustyfeet.com> Date:   Tue Nov 22 17:49:47 2016 -0500
+
+2016-11-23  rocky <rb@dustyfeet.com>
+
+	* circle.yml: Circle CI uses 2.7.10 and 2.7.12 is not available

 2016-11-22  rocky <rb@dustyfeet.com>

--- a/HISTORY.md
+++ b/HISTORY.md
@@ -44,8 +44,8 @@ it appears that Hartmut did most of the work to get this code to
 accept the full Python language. He added precedence to the table
 specifiers, support for multiple versions of Python, the
 pretty-printing of docstrings, lists, and hashes. He also wrote test and verification routines of
-deparsed bytecode, and used this in an extensive set of tests that he also wrote. He says he could verify against the 
-entire Python library. However I have subsequently found small and relatively obscure bugs in the decompilation code. 
+deparsed bytecode, and used this in an extensive set of tests that he also wrote. He says he could verify against the
+entire Python library. However I have subsequently found small and relatively obscure bugs in the decompilation code.

 decompyle2.2 was packaged for Debian (sarge) by
 [Ben Burton around 2002](https://packages.qa.debian.org/d/decompyle.html). As
@@ -66,7 +66,7 @@ code to handle first Python 2.3 and then 2.4 bytecodes. Because of
 jump optimization introduced in the CPython bytecode compiler at that
 time, various JUMP instructions were classifed as going backwards, and
 COME FROM instructions were reintroduced.  See
-[RELEASE-2.4-CHANGELOG.txt](https://github.com/rocky/python-uncompyle6/blob/master/DECOMPYLE-2.4-CHANGELOG.txt) 
+[RELEASE-2.4-CHANGELOG.txt](https://github.com/rocky/python-uncompyle6/blob/master/DECOMPYLE-2.4-CHANGELOG.txt)
 for more details here. There wasn't a public
 release of RELEASE-2.4 and bytecodes other than Python 2.4 weren't
 supported. Dan says the Python 2.3 version could verify the entire
@@ -99,7 +99,7 @@ made a few commits later on. But mostly wibiti, and Guenther
 Starnberger got the code to where uncompyle2 was around 2012.

 In `uncompyle`, decompilation of python bytecode 2.5 & 2.6 is done by
-transforming the byte code into a a pseudo 2.7 python bytecode and is
+transforming the byte code into a pseudo-2.7 Python bytecode and is
 based on code from Eloi Vanderbeken.

 This project, `uncompyle6`, abandons that approach for various
@@ -120,10 +120,10 @@ while, handling Python bytecodes from Python versions 2.5+ and
 3.2+. In doing so, it has been expedient to separate this into three
 projects:

-* bytecode loading and disassembly ([xdis](https://pypi.python.org/pypi/xdis)),
+* marshaling/unmarshaling, bytecode loading and disassembly ([xdis](https://pypi.python.org/pypi/xdis)),
 * parsing and tree building ([spark_parser](https://pypi.python.org/pypi/spark_parser)),
 * this project - grammar and semantic actions for decompiling
-  ([uncompyle6](https://pypi.python.org/pypi/spark_parser)).
+  ([uncompyle6](https://pypi.python.org/pypi/uncompyle6)).


 Over the many years, code styles and Python features have
@@ -162,5 +162,8 @@ support has been lagging.
 Tests for the project have been, or are being, culled from all of the
 projects mentioned.

+For a little bit of the history of changes to the Early-algorithm parser,
+see the file [NEW-FEATURES.rst](https://github.com/rocky/python-spark/blob/master/NEW-FEATURES.rst) in the [python-spark github repository](https://github.com/rocky/python-spark).
+
 NB. If you find mistakes, want corrections, or want your name added
 (or removed), please contact me.
--- a/HOW-TO-REPORT-A-BUG.md
+++ b/HOW-TO-REPORT-A-BUG.md
@@ -19,7 +19,7 @@ So it is likely you'll find a mistranslation in decompiling.
 The basic requirement is pretty simple:

 * Python bytecode
-* Source text
+* Python source text

 ## What to send (additional helpful information)

@@ -50,7 +50,7 @@ one fool can learn, so can another."

 ## Narrowing the problem

-I don't need the entire source code base for which one file or module
+I don't need or want the entire source code base for which one file or module
 can't be decompiled. I just need that one file or module only. If
 there are several files, file a bug report for each file.

--- a/4
+++ b/4
@@ -37,7 +37,7 @@ check-3.0 check-3.1 check-3.2 check-3.5 check-3.6:
 	$(MAKE) -C test $@

 #:Tests for Python 2.6 (doesn't have pytest)
-check-2.6:
+check-2.4 check-2.5 check-2.6:
 	$(MAKE) -C test $@

 #:PyPy 2.6.1 or PyPy 5.0.1
@@ -59,7 +59,7 @@ clean: clean_pyc

 #: Create source (tarball) and wheel distribution
 dist:
-	$(PYTHON) ./setup.py sdist bdist_wheel
+	$(PYTHON) ./setup.py sdist bdist_egg

 #: Remove .pyc files
 clean_pyc:
--- a/56
+++ b/56
@@ -1,10 +1,26 @@
-uncompyle6 2.11.1 2016-06-22
+uncompyle6 2.11.2 2017-08-09

- Python 3.x annotatoin and function signature fixes
+Very minor changes
+
+- RsT doc fixes and updates
+- use newer xdis, but not too new; 3.5.2 breaks uncompyle6
+- use xdis opcode sets
+- xdis "exception match" is now "exception-match"
+
+uncompyle6 2.11.2 2017-07-09
+
+- Start supporting Pypy 3.5 (5.7.1-beta)
+- use xdis 3.5.0's opcode sets and require xdis 3.5.0
+- Correct some Python 2.4-2.6 loop detection
+- guard against badly formatted bytecode
+
+uncompyle6 2.11.1 2017-06-25
+
+- Python 3.x annotation and function signature fixes
 - Bump xdis version
 - Small pysource bug fixes

-uncompyle6 2.11.0 2016-06-18 Fleetwood
+uncompyle6 2.11.0 2017-06-18 Fleetwood
 - Major improvements in fragment tracking
  * Add nonterminal node in extractInfo
  * tag more offsets in expressions
@@ -14,17 +30,17 @@ uncompyle6 2.11.0 2016-06-18 Fleetwood
 - Fixes yet again for make_function node handling; document what's up here
 - Fix bug in snowflake Python 3.5 *args kwargs

-uncompyle6 2.10.1 2016-06-3 Marylin Frankel
+uncompyle6 2.10.1 2017-06-3 Marylin Frankel

 - fix some fragments parsing bugs
  - was returning the wrong type sometimes in deparse_code_around_offset()
  - capture function name in offsets
  - track changes to ifelstrmtr node from pysource into fragments

-uncompyle6 2.10.0 2016-05-30 Elaine Gordon
+uncompyle6 2.10.0 2017-05-30 Elaine Gordon

- Add fuzzy offset deparse lookup
- 3.6 bugfixes
+- Add fuzzy offset deparse look up
+- 3.6 bug fixes
   - fix EXTENDED_ARGS handling (and in 2.6 and others)
   - semantic routine make_function fragments.py
   - MAKE_FUNCTION handling
@@ -35,19 +51,19 @@ uncompyle6 2.10.0 2016-05-30 Elaine Gordon
 - 3.5 FUNCTION_VAR bug
 - 3.x pass statement insdie while True
 - Improve 3.2 decompilation
- Fixed -o argument processing (Gregrory)
+- Fixed -o argument processing (grkov90)
 - Reduce scope of LOAD_ASSERT as expr to 3.4+
 - "await" statement fixes
 - 2.3, 2.4 "if 1 .." fixes
 - 3.x annotation fixes

-uncompyle6 2.9.11 2016-04-06
+uncompyle6 2.9.11 2017-04-06

 - Better support for Python 3.5+ BUILD_MAP_UNPACK
 - Start 3.6 CALL_FUNCTION_EX support
 - Many decompilation bug fixes. (Many more remain). See ChangeLog

-uncompyle6 2.9.10 2016-02-25
+uncompyle6 2.9.10 2017-02-25

 - Python grammar rule fixes
 - Add ability to get grammar coverage on runs
@@ -114,7 +130,7 @@ uncompyle6 2.9.6 2016-11-20
 uncompyle6 2.9.5 2016-11-13

 - Fix Python 3 bugs:
-  * improprer while 1 else
+  * improper while 1 else
  * docstring indent
  * 3.3 default values in lambda expressions
  * start 3.0 decompilation (needs newer xdis)
@@ -124,12 +140,12 @@ uncompyle6 2.9.5 2016-11-13
 uncompyle6 2.9.4 2016-11-02

 - Handle Python 3.x function annotations
- track def keywoard-parameter line-splitting in source code better
+- track def keyword-parameter line-splitting in source code better
 - bump min xdis version to mask previous xdis bug

 uncompyle6 2.9.3 2016-10-26

-Release forced by incompatiblity change in xdis 3.2.0.
+Release forced by incompatibility change in xdis 3.2.0.

 - Python 3.1 bugs:
  * handle "with ... as"
@@ -161,7 +177,7 @@ uncompyle6 2.9.0 2016-10-09
  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
+- Simplify 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

@@ -184,7 +200,7 @@ control-flow structure detection is done.
    . 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 .. handling variable number of args
    . 3.0 .. "if" structure bugs
  * 3.5+ if/else bugs
  * 2.2-2.6 bugs
@@ -235,7 +251,7 @@ uncompyle6 2.7.1 2016-07-26

 uncompyle6 2.7.0 2016-07-15

- Many Syntax and verifification bugs removed
+- Many Syntax and verification 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.
@@ -262,9 +278,9 @@ uncompyle6 2.6.0 2016-07-07
 - Better <2.6 vs. 2.7 grammar separation
 - Fix some 2.7 deparsing bugs
 - Fix bug in installing uncompyle6 script
- Doc improvments
+- Doc improvements

-uncompyle6 2.5.0 2016-06-22  Summer Solstace
+uncompyle6 2.5.0 2016-06-22  Summer Solstice

 - Much better Python 3.2-3.5 coverage.
  3.4.6 is probably the best;3.2 and 3.5 are weaker
@@ -276,7 +292,7 @@ uncompyle6 2.5.0 2016-06-22  Summer Solstace
 uncompyle6 2.4.0 2016-05-18 (in memory of Lewis Bernstein)

 - Many Python 3 bugs fixed:
-  * Python 3.2 to 3.5 libaries largely
+  * Python 3.2 to 3.5 libraries largely
    uncompyle and most verify
 - pydisassembler:
  * disassembles all code objects in a file
@@ -334,7 +350,7 @@ uncompyle6 2.2.0 2016-04-30

 uncompyle6 2.2.0 2016-04-02

- Support single-mode (in addtion to exec-mode) compilation
+- Support single-mode (in addition to exec-mode) compilation
 - Start to DRY Python 2 and Python 3 grammars
 - Fix bug in if else ternary  construct
 - Fix bug in uncomplye6 -d and -r options (via lelicopter)
--- a/README.rst
+++ b/README.rst
@@ -171,8 +171,11 @@ See Also
 * https://code.google.com/archive/p/unpyc3/ : supports Python 3.2 only. The above projects use a different decompiling technique than what is used here.
 * https://github.com/figment/unpyc3/ : fork of above, but supports Python 3.3 only. Include some fixes like supporting function annotations
 * The HISTORY_ file.
-* `How to report a bug <https://github.com/rocky/python-uncompyle6/blob/master/HISTORY.md>`_
-.. |downloads| image:: https://img.shields.io/pypi/dd/uncompyle6.svg
+* `How to report a bug <https://github.com/rocky/python-uncompyle6/blob/master/HOW-TO-REPORT-A-BUG.md>`_
+* https://github.com/rocky/python-xdis : Cross Python version disassembler
+* https://github.com/rocky/python-xasm : Cross Python version assembler
+
+
 .. _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
--- a/pkginfo.py
+++ b/pkginfo.py
@@ -40,7 +40,7 @@ entry_points       = {
    ]}
 ftp_url            = None
 install_requires   = ['spark-parser >= 1.6.1, < 1.7.0',
-                      'xdis >= 3.4.0, < 3.5.0', 'six']
+                      'xdis == 3.5.1, < 3.6.0']
 license            = 'MIT'
 mailing_list       = 'python-debugger@googlegroups.com'
 modname            = 'uncompyle6'
--- a/circle.yml
+++ b/circle.yml
@@ -10,4 +10,4 @@ dependencies:
        - pip install -r requirements-dev.txt
 test:
    override:
-        - python ./setup.py develop && make check-2.7
+        - python ./setup.py develop && make check-2.6
--- a/pytest/test_deparse.py
+++ b/pytest/test_deparse.py
@@ -29,7 +29,7 @@ def list_comp():
    [y for y in range(3)]

 def get_parsed_for_fn(fn):
-    code = fn.__code__ if PYTHON3 else fn.func_code
+    code = fn.func_code
    return deparse(PYTHON_VERSION, code)

 def check_expect(expect, parsed):
--- a/pytest/test_disasm.py-notyet
+++ b/pytest/test_disasm.py-notyet
--- a/pytest/test_docstring.py
+++ b/pytest/test_docstring.py
@@ -10,7 +10,7 @@ else:
    maxint = sys.maxint
 from uncompyle6.semantics.helper import print_docstring

-class PrintFake():
+class PrintFake:
    def __init__(self):
        self.pending_newlines = 0
        self.f = StringIO()
--- a/pytest/test_fjt.py
+++ b/pytest/test_fjt.py
@@ -21,9 +21,8 @@ def bug_loop(disassemble, tb=None):
    disassemble(tb)

 def test_if_in_for():
-    code = bug.__code__
+    code = bug.func_code
    scan = get_scanner(PYTHON_VERSION)
-    print(PYTHON_VERSION)
    if 2.7 <= PYTHON_VERSION <= 3.0 and not IS_PYPY:
        n = scan.setup_code(code)
        scan.build_lines_data(code, n)
--- a/pytest/test_fstring.py
+++ b/pytest/test_fstring.py
@@ -1,150 +0,0 @@
-# std
-import os
-# test
-import pytest
-import hypothesis
-from hypothesis import strategies as st
-# uncompyle6
-from uncompyle6 import PYTHON_VERSION, deparse_code
-
-
-@st.composite
-def expressions(draw):
-    # todo : would be nice to generate expressions using hypothesis however
-    # this is pretty involved so for now just use a corpus of expressions
-    # from which to select.
-    return draw(st.sampled_from((
-        'abc',
-        'len(items)',
-        'x + 1',
-        'lineno',
-        'container',
-        'self.attribute',
-        'self.method()',
-        # These expressions are failing, I think these are control
-        # flow problems rather than problems with FORMAT_VALUE,
-        # however I need to confirm this...
-        #'sorted(items, key=lambda x: x.name)',
-        #'func(*args, **kwargs)',
-        #'text or default',
-        #'43 if life_the_universe and everything else None'
-    )))
-
-
-@st.composite
-def format_specifiers(draw):
-    """
-    Generate a valid format specifier using the rules:
-
-    format_spec ::=  [[fill]align][sign][#][0][width][,][.precision][type]
-    fill        ::=  <any character>
-    align       ::=  "<" | ">" | "=" | "^"
-    sign        ::=  "+" | "-" | " "
-    width       ::=  integer
-    precision   ::=  integer
-    type        ::=  "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"
-
-    See https://docs.python.org/2/library/string.html
-
-    :param draw: Let hypothesis draw from other strategies.
-
-    :return: An example format_specifier.
-    """
-    alphabet_strategy = st.characters(min_codepoint=ord('a'), max_codepoint=ord('z'))
-    fill = draw(st.one_of(alphabet_strategy, st.none()))
-    align = draw(st.sampled_from(list('<>=^')))
-    fill_align = (fill + align or '') if fill else ''
-
-    type_ = draw(st.sampled_from('bcdeEfFgGnosxX%'))
-    can_have_sign = type_ in 'deEfFgGnoxX%'
-    can_have_comma = type_ in 'deEfFgG%'
-    can_have_precision = type_ in 'fFgG'
-    can_have_pound = type_ in 'boxX%'
-    can_have_zero = type_ in 'oxX'
-
-    sign = draw(st.sampled_from(list('+- ') + [''])) if can_have_sign else ''
-    pound = draw(st.sampled_from(('#', '',))) if can_have_pound else ''
-    zero = draw(st.sampled_from(('0', '',))) if can_have_zero else ''
-
-    int_strategy = st.integers(min_value=1, max_value=1000)
-
-    width = draw(st.one_of(int_strategy, st.none()))
-    width = str(width) if width is not None else ''
-
-    comma = draw(st.sampled_from((',', '',))) if can_have_comma else ''
-    if can_have_precision:
-        precision = draw(st.one_of(int_strategy, st.none()))
-        precision = '.' + str(precision) if precision else ''
-    else:
-        precision = ''
-
-    return ''.join((fill_align, sign, pound, zero, width, comma, precision, type_,))
-
-
-@st.composite
-def fstrings(draw):
-    """
-    Generate a valid f-string.
-    See https://www.python.org/dev/peps/pep-0498/#specification
-
-    :param draw: Let hypothsis draw from other strategies.
-
-    :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())
-        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)
-
-
-@pytest.mark.skipif(PYTHON_VERSION < 3.6, reason='need at least python 3.6')
-@hypothesis.given(format_specifiers())
-def test_format_specifiers(format_specifier):
-    """Verify that format_specifiers generates valid specifiers"""
-    try:
-        exec('"{:' + format_specifier + '}".format(0)')
-    except ValueError as e:
-        if 'Unknown format code' not in str(e):
-            raise
-
-
-def run_test(text):
-    hypothesis.assume(len(text))
-    hypothesis.assume("f'{" in 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)
-
-
-@pytest.mark.skipif(PYTHON_VERSION < 3.6, reason='need at least python 3.6')
-@pytest.mark.parametrize('fstring', [
-    "f'{abc}{abc!s}'",
-    "f'{abc}0'",
-])
-def test_uncompyle_direct(fstring):
-    """useful for debugging"""
-    run_test(fstring)
--- a/pytest/test_function_call.py
+++ b/pytest/test_function_call.py
@@ -1,175 +0,0 @@
-# std
-import string
-# 3rd party
-from hypothesis import given, assume, example, settings, strategies as st
-import pytest
-# uncompyle
-from validate import validate_uncompyle
-from test_fstring import expressions
-
-
-alpha = st.sampled_from(string.ascii_lowercase)
-numbers = st.sampled_from(string.digits)
-alphanum = st.sampled_from(string.ascii_lowercase + string.digits)
-
-
-@st.composite
-def function_calls(draw,
-                   min_keyword_args=0, max_keyword_args=5,
-                   min_positional_args=0, max_positional_args=5,
-                   min_star_args=0, max_star_args=1,
-                   min_double_star_args=0, max_double_star_args=1):
-    """
-    Strategy factory for generating function calls.
-
-    :param draw: Callable which draws examples from other strategies.
-
-    :return: The function call text.
-    """
-    st_positional_args = st.lists(
-        alpha,
-        min_size=min_positional_args,
-        max_size=max_positional_args
-    )
-    st_keyword_args = st.lists(
-        alpha,
-        min_size=min_keyword_args,
-        max_size=max_keyword_args
-    )
-    st_star_args = st.lists(
-        alpha,
-        min_size=min_star_args,
-        max_size=max_star_args
-    )
-    st_double_star_args = st.lists(
-        alpha,
-        min_size=min_double_star_args,
-        max_size=max_double_star_args
-    )
-
-    positional_args = draw(st_positional_args)
-    keyword_args = draw(st_keyword_args)
-    st_values = st.lists(
-        expressions(),
-        min_size=len(keyword_args),
-        max_size=len(keyword_args)
-    )
-    keyword_args = [
-        x + '=' + e
-        for x, e in
-        zip(keyword_args, draw(st_values))
-    ]
-    star_args = ['*' + x for x in draw(st_star_args)]
-    double_star_args = ['**' + x for x in draw(st_double_star_args)]
-
-    arguments = positional_args + keyword_args + star_args + double_star_args
-    draw(st.randoms()).shuffle(arguments)
-    arguments = ','.join(arguments)
-
-    function_call = 'fn({arguments})'.format(arguments=arguments)
-    try:
-        # TODO: Figure out the exact rules for ordering of positional, keyword,
-        # star args, double star args and in which versions the various
-        # types of arguments are supported so we don't need to check that the
-        # expression compiles like this.
-        compile(function_call, '<string>', 'single')
-    except:
-        assume(False)
-    return function_call
-
-
-def test_function_no_args():
-    validate_uncompyle("fn()")
-
-
-def isolated_function_calls(which):
-    """
-    Returns a strategy for generating function calls, but isolated to 
-    particular types of arguments, for example only positional arguments.
-
-    This can help reason about debugging errors in specific types of function
-    calls.
-
-    :param which: One of 'keyword', 'positional', 'star', 'double_star'
-
-    :return: Strategy for generating an function call isolated to specific
-             argument types.
-    """
-    kwargs = dict(
-        max_keyword_args=0,
-        max_positional_args=0,
-        max_star_args=0,
-        max_double_star_args=0,
-    )
-    kwargs['_'.join(('min', which, 'args'))] = 1
-    kwargs['_'.join(('max', which, 'args'))] = 5 if 'star' not in which else 1
-    return function_calls(**kwargs)
-
-
-with settings(max_examples=25):
-
-    @given(isolated_function_calls('positional'))
-    @example("fn(0)")
-    def test_function_positional_only(expr):
-        validate_uncompyle(expr)
-
-    @given(isolated_function_calls('keyword'))
-    @example("fn(a=0)")
-    def test_function_call_keyword_only(expr):
-        validate_uncompyle(expr)
-
-    @given(isolated_function_calls('star'))
-    @example("fn(*items)")
-    def test_function_call_star_only(expr):
-        validate_uncompyle(expr)
-
-    @given(isolated_function_calls('double_star'))
-    @example("fn(**{})")
-    def test_function_call_double_star_only(expr):
-        validate_uncompyle(expr)
-
-
-@pytest.mark.xfail()
-def test_BUILD_CONST_KEY_MAP_BUILD_MAP_UNPACK_WITH_CALL_BUILD_TUPLE_CALL_FUNCTION_EX():
-    validate_uncompyle("fn(w=0,m=0,**v)")
-
-
-@pytest.mark.xfail()
-def test_BUILD_MAP_BUILD_MAP_UNPACK_WITH_CALL_BUILD_TUPLE_CALL_FUNCTION_EX():
-    validate_uncompyle("fn(a=0,**g)")
-
-
-@pytest.mark.xfail()
-def test_CALL_FUNCTION_EX():
-    validate_uncompyle("fn(*g,**j)")
-
-
-@pytest.mark.xfail()
-def test_BUILD_MAP_CALL_FUNCTION_EX():
-    validate_uncompyle("fn(*z,u=0)")
-
-
-@pytest.mark.xfail()
-def test_BUILD_TUPLE_CALL_FUNCTION_EX():
-    validate_uncompyle("fn(**a)")
-
-
-@pytest.mark.xfail()
-def test_BUILD_MAP_BUILD_TUPLE_BUILD_TUPLE_UNPACK_WITH_CALL_CALL_FUNCTION_EX():
-    validate_uncompyle("fn(b,b,b=0,*a)")
-
-
-@pytest.mark.xfail()
-def test_BUILD_TUPLE_BUILD_TUPLE_UNPACK_WITH_CALL_CALL_FUNCTION_EX():
-    validate_uncompyle("fn(*c,v)")
-
-
-@pytest.mark.xfail()
-def test_BUILD_CONST_KEY_MAP_CALL_FUNCTION_EX():
-    validate_uncompyle("fn(i=0,y=0,*p)")
-
-
-@pytest.mark.skip(reason='skipping property based test until all individual tests are passing')
-@given(function_calls())
-def test_function_call(function_call):
-    validate_uncompyle(function_call)
--- a/pytest/test_single_compile.py
+++ b/pytest/test_single_compile.py
@@ -1,19 +1,19 @@
-import pytest
-from uncompyle6 import PYTHON_VERSION, PYTHON3, deparse_code
+from uncompyle6 import PYTHON_VERSION, deparse_code

-def test_single_mode():
-    single_expressions = (
-        'i = 1',
-        'i and (j or k)',
-        'i += 1',
-        'i = j % 4',
-        'i = {}',
-        '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'
-    )
+if PYTHON_VERSION >= 2.5:
+    def test_single_mode():
+        single_expressions = (
+            'i = 1',
+            'i and (j or k)',
+            'i += 1',
+            'i = j % 4',
+            'i = {}',
+            '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'
+        )

-    for expr in single_expressions:
-        code = compile(expr + '\n', '<string>', 'single')
-        assert deparse_code(PYTHON_VERSION, code, compile_mode='single').text == expr + '\n'
+        for expr in single_expressions:
+            code = compile(expr + '\n', '<string>', 'single')
+            assert deparse_code(PYTHON_VERSION, code, compile_mode='single').text == expr + '\n'
--- a/pytest/validate.py
+++ b/pytest/validate.py
@@ -1,24 +1,25 @@
-# future
-from __future__ import print_function
 # std
 import os
 import difflib
 import subprocess
 import tempfile
-import functools
-# compatability
-import six
+
+from StringIO import StringIO
 # uncompyle6 / xdis
 from uncompyle6 import PYTHON_VERSION, IS_PYPY, deparse_code
 # TODO : I think we can get xdis to support the dis api (python 3 version) by doing something like this there
 from xdis.bytecode import Bytecode
 from xdis.main import get_opcode
 opc = get_opcode(PYTHON_VERSION, IS_PYPY)
-Bytecode = functools.partial(Bytecode, opc=opc)

+try:
+    import functools
+    Bytecode = functools.partial(Bytecode, opc=opc)
+    def _dis_to_text(co):
+        return Bytecode(co).dis()
+except:
+    pass

-def _dis_to_text(co):
-    return Bytecode(co).dis()


 def print_diff(original, uncompyled):
@@ -42,8 +43,11 @@ def print_diff(original, uncompyled):
        print('\nTo display diff highlighting run:\n    pip install BeautifulSoup4')
        diff = difflib.HtmlDiff().make_table(*args)

-    with tempfile.NamedTemporaryFile(delete=False) as f:
+    f = tempfile.NamedTemporaryFile(delete=False)
+    try:
        f.write(str(diff).encode('utf-8'))
+    finally:
+        f.close()

    try:
        print()
@@ -60,8 +64,7 @@ def print_diff(original, uncompyled):
        print('\nFor side by side diff install elinks')
        diff = difflib.Differ().compare(original_lines, uncompyled_lines)
        print('\n'.join(diff))
-    finally:
-        os.unlink(f.name)
+    os.unlink(f.name)


 def are_instructions_equal(i1, i2):
@@ -123,7 +126,7 @@ def validate_uncompyle(text, mode='exec'):
    original_text = text

    deparsed = deparse_code(PYTHON_VERSION, original_code,
-                            compile_mode=mode, out=six.StringIO())
+                            compile_mode=mode, out=StringIO())
    uncompyled_text = deparsed.text
    uncompyled_code = compile(uncompyled_text, '<string>', 'exec')

--- a/test/Makefile
+++ b/test/Makefile
@@ -19,7 +19,7 @@ check:
 	$(MAKE) check-$(PYTHON_VERSION)

 #: Run working tests from Python 2.6 or 2.7
-check-2.6 check-2.7: check-bytecode-2 check-bytecode-3 check-bytecode-1 check-native-short
+check-2.4 check-2.5 check-2.6 check-2.7: check-bytecode-2 check-bytecode-3 check-bytecode-1  check-native-short

 #: Run working tests from Python 3.0
 check-3.0: check-bytecode
@@ -67,7 +67,7 @@ check-bytecode-2:
 check-bytecode-3:
 	$(PYTHON) test_pythonlib.py --bytecode-3.0 \
       --bytecode-3.1 --bytecode-3.2 --bytecode-3.3 \
-       --bytecode-3.4 --bytecode-3.5 --bytecode-pypy3.2
+       --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
@@ -97,29 +97,6 @@ check-bytecode-2.4:
 check-bytecode-2.5:
 	$(PYTHON) test_pythonlib.py --bytecode-2.5

-#: Get grammar coverage for Python 2.5
-grammar-coverage-2.5:
-	SPARK_PARSER_COVERAGE=/tmp/spark-grammar-25.cover $(PYTHON) test_pythonlib.py --bytecode-2.5
-	SPARK_PARSER_COVERAGE=/tmp/spark-grammar-25.cover $(PYTHON) test_pyenvlib.py --2.5.6
-
-#: Get grammar coverage for Python 2.6
-grammar-coverage-2.6:
-	SPARK_PARSER_COVERAGE=/tmp/spark-grammar-26.cover $(PYTHON) test_pythonlib.py --bytecode-2.6
-	SPARK_PARSER_COVERAGE=/tmp/spark-grammar-26.cover $(PYTHON) test_pyenvlib.py --2.6.9
-
-#: Get grammar coverage for Python 2.7
-grammar-coverage-2.7:
-	SPARK_PARSER_COVERAGE=/tmp/spark-grammar-27.cover $(PYTHON) test_pythonlib.py --bytecode-2.7
-	SPARK_PARSER_COVERAGE=/tmp/spark-grammar-27.cover $(PYTHON) test_pyenvlib.py --2.7.13
-
-#: Check deparsing Python 2.6
-check-bytecode-2.6:
-	$(PYTHON) test_pythonlib.py --bytecode-2.6 --weak-verify
-
-#: Check deparsing Python 2.7
-check-bytecode-2.7:
-	$(PYTHON) test_pythonlib.py --bytecode-2.7 --verify
-
 #: Check deparsing Python 3.0
 check-bytecode-3.0:
 	$(PYTHON) test_pythonlib.py --bytecode-3.0
@@ -148,9 +125,33 @@ check-bytecode-3.5:
 check-bytecode-3.6:
 	$(PYTHON) test_pythonlib.py --bytecode-3.6

+#: Get grammar coverage for Python 2.4
+grammar-coverage-2.4:
+	SPARK_PARSER_COVERAGE=/tmp/spark-grammar-24.cover $(PYTHON) test_pythonlib.py --bytecode-2.4
+	SPARK_PARSER_COVERAGE=/tmp/spark-grammar-24.cover $(PYTHON) test_pyenvlib.py --2.4.6
+
+#: Get grammar coverage for Python 2.5
+grammar-coverage-2.5:
+	SPARK_PARSER_COVERAGE=/tmp/spark-grammar-25.cover $(PYTHON) test_pythonlib.py --bytecode-2.5
+	SPARK_PARSER_COVERAGE=/tmp/spark-grammar-25.cover $(PYTHON) test_pyenvlib.py --2.5.6
+
+#: Get grammar coverage for Python 2.6
+grammar-coverage-2.6:
+	SPARK_PARSER_COVERAGE=/tmp/spark-grammar-26.cover $(PYTHON) test_pythonlib.py --bytecode-2.6
+	SPARK_PARSER_COVERAGE=/tmp/spark-grammar-26.cover $(PYTHON) test_pyenvlib.py --2.6.9
+
+#: Get grammar coverage for Python 2.7
+grammar-coverage-2.7:
+	SPARK_PARSER_COVERAGE=/tmp/spark-grammar-27.cover $(PYTHON) test_pythonlib.py --bytecode-2.7
+	SPARK_PARSER_COVERAGE=/tmp/spark-grammar-27.cover $(PYTHON) test_pyenvlib.py --2.7.13
+
 #: short tests for bytecodes only for this version of Python
 check-native-short:
-	$(PYTHON) test_pythonlib.py --bytecode-$(PYTHON_VERSION) --verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --bytecode-$(PYTHON_VERSION) --weak-verify $(COMPILE)
+
+#: Run longer Python 2.6's lib files known to be okay
+check-2.4-ok:
+	$(PYTHON) test_pythonlib.py --ok-2.4 --verify $(COMPILE)

 #: Run longer Python 2.6's lib files known to be okay
 check-2.6-ok:
--- a/test/bytecode_2.4/01_ops.pyc
+++ b/test/bytecode_2.4/01_ops.pyc
--- a/test/bytecode_2.5/01_ops.pyc
+++ b/test/bytecode_2.5/01_ops.pyc
--- a/test/bytecode_2.5/02_try_else.pyc
+++ b/test/bytecode_2.5/02_try_else.pyc
--- a/test/bytecode_2.6/03_loop_if_cf.pyc
+++ b/test/bytecode_2.6/03_loop_if_cf.pyc
--- a/test/bytecode_3.1/04_def_annotate.pyc
+++ b/test/bytecode_3.1/04_def_annotate.pyc
--- a/test/dis-compare.py
+++ b/test/dis-compare.py
@@ -1,9 +1,8 @@
 #!/usr/bin/env python
 # Mode: -*- python -*-
 #
-# Copyright (c) 2015 by Rocky Bernstein <rb@dustyfeet.com>
+# Copyright (c) 2015, 2017 by Rocky Bernstein <rb@dustyfeet.com>
 #
-from __future__ import print_function


 import dis, os.path
--- a/test/simple-uncompyle-code-test.py
+++ b/test/simple-uncompyle-code-test.py
@@ -1,7 +1,5 @@
 #!/usr/bin/env python

-from __future__ import print_function
-
 from uncompyle6 import uncompyle
 import sys, inspect

--- a/test/simple_source/bug26/03_loop_if_cf.py
+++ b/test/simple_source/bug26/03_loop_if_cf.py
@@ -0,0 +1,19 @@
+# Bug in < 2.6 is having a COME_FROM_LOOP (but we
+# don't tag that so it is just COME_FROM *before*
+# a jump back to the loop.
+def pickup(self, open_players, open_buf, wrap_buf):
+   for aplayer in self._game.active_players:
+
+      if aplayer in open_players:
+         aplayer.send(open_players)
+
+         if self == aplayer:
+            for awatcher in self._watchers:
+               if awatcher._can_see_detail:
+                  awatcher.send(open_buf)
+               else:
+                  awatcher.send(wrap_buf)
+         else:
+            self._game.send(aplayer.side)
+      else:
+         self._game.send(aplayer.side, wrap_buf)
--- a/test/test_pyenvlib.py
+++ b/test/test_pyenvlib.py
@@ -19,8 +19,6 @@ Step 2: Run the test:
 	  test_pyenvlib --mylib --verify # decompile verify 'mylib'
 """

-from __future__ import print_function
-
 from uncompyle6 import main, PYTHON3
 import os, time, shutil, sys
 from fnmatch import fnmatch
@@ -29,7 +27,7 @@ from fnmatch import fnmatch

 TEST_VERSIONS=('2.3.7', '2.4.6', '2.5.6', '2.6.9',
               'pypy-2.4.0', 'pypy-2.6.1',
-               'pypy-5.0.1', 'pypy-5.3.1',
+               'pypy-5.0.1', 'pypy-5.3.1', 'pypy3.5-5.7.1-beta',
               '2.7.10', '2.7.11', '2.7.12', '2.7.13',
               '3.0.1', '3.1.5', '3.2.6',
               '3.3.5', '3.3.6',
--- a/test/test_pythonlib.py
+++ b/test/test_pythonlib.py
@@ -27,8 +27,6 @@ Step 2: Run the test:
  test_pythonlib.py --mylib --verify # decompile verify 'mylib'
 """

-from __future__ import print_function
-
 import getopt, os, py_compile, sys, shutil, tempfile, time

 from uncompyle6 import PYTHON_VERSION
@@ -127,8 +125,10 @@ def do_tests(src_dir, obj_patterns, target_dir, opts):
    if opts['do_compile']:
        compiled_version = opts['compiled_version']
        if compiled_version and PYTHON_VERSION != compiled_version:
-            print("Not compiling: desired Python version is %s but we are running %s" %
-                  (compiled_version, PYTHON_VERSION), file=sys.stderr)
+            sys.stderr.write("Not compiling: "
+                             "desired Python version is %s "
+                             "but we are running %s" %
+                             (compiled_version, PYTHON_VERSION))
        else:
            for root, dirs, basenames in os.walk(src_dir):
                file_matches(files, root, basenames, PY)
@@ -146,8 +146,8 @@ def do_tests(src_dir, obj_patterns, target_dir, opts):
        file_matches(files, dirname, basenames, obj_patterns)

    if not files:
-        print("Didn't come up with any files to test! Try with --compile?",
-              file=sys.stderr)
+        sys.stderr.write("Didn't come up with any files to test! "
+                         "Try with --compile?")
        exit(1)

    os.chdir(cwd)
@@ -161,9 +161,9 @@ def do_tests(src_dir, obj_patterns, target_dir, opts):
        except ValueError:
            pass

-    print(time.ctime())
-    print('Source directory: ', src_dir)
-    print('Output directory: ', target_dir)
+    print time.ctime()
+    print 'Source directory: ', src_dir
+    print 'Output directory: ', target_dir
    try:
        _, _, failed_files, failed_verify = \
          main(src_dir, target_dir, files, [],
@@ -236,14 +236,13 @@ if __name__ == '__main__':
        if os.path.isdir(src_dir):
            checked_dirs.append([src_dir, pattern, target_dir])
        else:
-            print("Can't find directory %s. Skipping" % src_dir,
-                  file=sys.stderr)
+            sys.stderr.write("Can't find directory %s. Skipping" % src_dir)
            continue
        last_compile_version = compiled_version
        pass

    if not checked_dirs:
-        print("No directories found to check", file=sys.stderr)
+        sys.stderr.write("No directories found to check\n")
        sys.exit(1)

    test_opts['compiled_version'] = last_compile_version
--- a/uncompyle6/bin/pydisassemble.py
+++ b/uncompyle6/bin/pydisassemble.py
@@ -3,7 +3,6 @@
 #
 # Copyright (c) 2015-2016 by Rocky Bernstein <rb@dustyfeet.com>
 #
-from __future__ import print_function
 import sys, os, getopt

 from uncompyle6.disas import disassemble_file
@@ -26,7 +25,7 @@ Options:
  -V | --version     show version and stop
  -h | --help        show this message

-""".format(program)
+""" % (program, program)

 PATTERNS = ('*.pyc', '*.pyo')

@@ -37,15 +36,15 @@ Type -h for for full help.""" % program
    native = True

    if len(sys.argv) == 1:
-        print("No file(s) given", file=sys.stderr)
-        print(Usage_short, file=sys.stderr)
+        sys.stderr.write("No file(s) given\n")
+        sys.stderr.write(Usage_short)
        sys.exit(1)

    try:
        opts, files = getopt.getopt(sys.argv[1:], 'hVU',
                                    ['help', 'version', 'uncompyle6'])
-    except getopt.GetoptError as e:
-        print('%s: %s' % (os.path.basename(sys.argv[0]), e),  file=sys.stderr)
+    except getopt.GetoptError(e):
+        sys.stderr.write('%s: %s' % (os.path.basename(sys.argv[0]), e))
        sys.exit(-1)

    for opt, val in opts:
@@ -59,15 +58,14 @@ Type -h for for full help.""" % program
            native = False
        else:
            print(opt)
-            print(Usage_short, file=sys.stderr)
+            sys.stderr.write(Usage_short)
            sys.exit(1)

    for file in files:
        if os.path.exists(files[0]):
            disassemble_file(file, sys.stdout, native)
        else:
-            print("Can't read %s - skipping" % files[0],
-                  file=sys.stderr)
+            sys.stderr.write("Can't read %s - skipping\n" % files[0])
            pass
        pass
    return
--- a/uncompyle6/bin/uncompile.py
+++ b/uncompyle6/bin/uncompile.py
@@ -4,7 +4,6 @@
 # Copyright (c) 2015-2016 by Rocky Bernstein
 # Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com>
 #
-from __future__ import print_function
 import sys, os, getopt, time

 program, ext = os.path.splitext(os.path.basename(__file__))
@@ -65,11 +64,11 @@ def usage():


 def main_bin():
-    if not (sys.version_info[0:2] in ((2, 6), (2, 7),
-                                      (3, 1), (3, 2), (3, 3),
+    if not (sys.version_info[0:2] in ((2, 4), (2, 5), (2, 6), (2, 7),
+                                      (3, 2), (3, 3),
                                      (3, 4), (3, 5), (3, 6))):
-        print('Error: %s requires Python 2.6-2.7, or 3.1-3.6' % program,
-              file=sys.stderr)
+        sys.stderr.write('Error: %s requires Python 2.4 2.5 2.6, 2.7, '
+                         '3.2, 3.3, 3.4, 3.5, or 3.6' % program)
        sys.exit(-1)

    do_verify = recurse_dirs = False
@@ -84,8 +83,8 @@ def main_bin():
        opts, files = getopt.getopt(sys.argv[1:], 'hagtdrVo:c:p:',
                                    'help asm grammar linemaps recurse timestamp tree '
                                    'verify version showgrammar'.split(' '))
-    except getopt.GetoptError as e:
-        print('%s: %s' % (os.path.basename(sys.argv[0]), e),  file=sys.stderr)
+    except getopt.GetoptError(e):
+        sys.stderr.write('%s: %s\n' % (os.path.basename(sys.argv[0]), e))
        sys.exit(-1)

    options = {}
@@ -119,7 +118,7 @@ def main_bin():
        elif opt in ('--recurse', '-r'):
            recurse_dirs = True
        else:
-            print(opt, file=sys.stderr)
+            sys.stderr.write(opt)
            usage()

    # expand directory if specified
@@ -144,7 +143,7 @@ def main_bin():
        files = [f[sb_len:] for f in files]

    if not files:
-        print("No files given", file=sys.stderr)
+        sys.stderr.write("No files given\n")
        usage()

    if outfile == '-':
--- a/uncompyle6/disas.py
+++ b/uncompyle6/disas.py
@@ -16,8 +16,6 @@ Second, we need structured instruction information for the
 want to run on Python 2.7.
 """

-from __future__ import print_function
-
 import sys
 from collections import deque

@@ -37,10 +35,9 @@ def disco(version, co, out=None, is_pypy=False):

    # store final output stream for case of error
    real_out = out or sys.stdout
-    print('# Python %s' % version, file=real_out)
+    real_out.write('# Python %s\n' % version)
    if co.co_filename:
-        print('# Embedded file name: %s' % co.co_filename,
-              file=real_out)
+        real_out.write('# Embedded file name: %s\n' % co.co_filename)

    scanner = get_scanner(version, is_pypy=is_pypy)

@@ -52,16 +49,15 @@ def disco_loop(disasm, queue, real_out):
    while len(queue) > 0:
        co = queue.popleft()
        if co.co_name != '<module>':
-            print('\n# %s line %d of %s' %
-                      (co.co_name, co.co_firstlineno, co.co_filename),
-                      file=real_out)
+            real_out.write('\n# %s line %d of %s\n' %
+                      (co.co_name, co.co_firstlineno, co.co_filename))
        tokens, customize = disasm(co)
        for t in tokens:
            if iscode(t.pattr):
                queue.append(t.pattr)
            elif iscode(t.attr):
                queue.append(t.attr)
-            print(t, file=real_out)
+            real_out.write(t)
            pass
        pass

--- a/uncompyle6/linenumbers.py
+++ b/uncompyle6/linenumbers.py
@@ -10,7 +10,7 @@ def line_number_mapping(pyc_filename, src_filename):
     source_size) = load_module(pyc_filename)
    try:
        code2 = load_file(src_filename)
-    except SyntaxError as e:
+    except SyntaxError, e:
        return str(e)

    queue = deque([code1, code2])
--- a/uncompyle6/main.py
+++ b/uncompyle6/main.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 import datetime, os, subprocess, sys, tempfile

 from uncompyle6 import verify, IS_PYPY
@@ -22,31 +21,36 @@ def decompile(

    # store final output stream for case of error
    real_out = out or sys.stdout
-    co_pypy_str = 'PyPy ' if is_pypy else ''
-    run_pypy_str = 'PyPy ' if IS_PYPY else ''
-    print('# uncompyle6 version %s\n'
-          '# %sPython bytecode %s%s\n# Decompiled from: %sPython %s' %
-          (VERSION, co_pypy_str, bytecode_version,
-           " (%d)" % magic_int if magic_int else "",
-           run_pypy_str, '\n# '.join(sys.version.split('\n'))),
-           file=real_out)
-    if co.co_filename:
-        print('# Embedded file name: %s' % co.co_filename,
-              file=real_out)
-    if timestamp:
-        print('# Compiled at: %s' % datetime.datetime.fromtimestamp(timestamp),
-              file=real_out)
-    if source_size:
-        print('# Size of source mod 2**32: %d bytes' % source_size,
-               file=real_out)
+    if is_pypy:
+        co_pypy_str = 'PyPy '
+    else:
+        co_pypy_str = ''

-    try:
-        pysource.deparse_code(bytecode_version, co, out, showasm, showast,
-                              showgrammar, code_objects=code_objects,
-                              is_pypy=is_pypy)
-    except pysource.SourceWalkerError as e:
-        # deparsing failed
-        raise pysource.SourceWalkerError(str(e))
+    if IS_PYPY:
+        run_pypy_str = 'PyPy '
+    else:
+        run_pypy_str = ''
+
+    if magic_int:
+        m = str(magic_int)
+    else:
+        m = ""
+    real_out.write('# uncompyle6 version %s\n'
+          '# %sPython bytecode %s%s\n# Decompiled from: %sPython %s\n' %
+          (VERSION, co_pypy_str, bytecode_version,
+           " (%s)" % m, run_pypy_str,
+           '\n# '.join(sys.version.split('\n'))))
+    if co.co_filename:
+        real_out.write('# Embedded file name: %s\n' % co.co_filename)
+    if timestamp:
+        real_out.write('# Compiled at: %s\n' %
+                       datetime.datetime.fromtimestamp(timestamp))
+    if source_size:
+        real_out.write('# Size of source mod 2**32: %d bytes\n' % source_size)
+
+    pysource.deparse_code(bytecode_version, co, out, showasm, showast,
+                          showgrammar, code_objects=code_objects,
+                          is_pypy=is_pypy)

 # For compatiblity
 uncompyle = decompile
@@ -128,7 +132,10 @@ def main(in_base, out_base, files, codes, outfile=None,
                junk, outfile = tempfile.mkstemp(suffix=".py",
                                             prefix=prefix)
                # Unbuffer output if possible
-                buffering = -1 if sys.stdout.isatty() else 0
+                if sys.stdout.isatty():
+                    buffering = -1
+                else:
+                    buffering = 0
                sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', buffering)
                tee = subprocess.Popen(["tee", outfile], stdin=subprocess.PIPE)
                os.dup2(tee.stdin.fileno(), sys.stdout.fileno())
@@ -145,9 +152,9 @@ def main(in_base, out_base, files, codes, outfile=None,
        try:
            decompile_file(infile, outstream, showasm, showast, showgrammar)
            tot_files += 1
-        except (ValueError, SyntaxError, ParserError, pysource.SourceWalkerError) as e:
+        except (ValueError, SyntaxError, ParserError, pysource.SourceWalkerError):
            sys.stdout.write("\n")
-            sys.stderr.write("\n# file %s\n# %s\n" % (infile, e))
+            sys.stderr.write("# file %s\n" % (infile))
            failed_files += 1
        except KeyboardInterrupt:
            if outfile:
@@ -181,24 +188,28 @@ def main(in_base, out_base, files, codes, outfile=None,
                        msg = verify.compare_code_with_srcfile(infile, current_outfile, weak_verify=weak_verify)
                        if not current_outfile:
                            if not msg:
-                                print('\n# okay decompiling %s' % infile)
+                                print '\n# okay decompiling %s' % infile
                                okay_files += 1
                            else:
-                                print('\n# %s\n\t%s', infile, msg)
-                    except verify.VerifyCmpError as e:
+                                print '\n# %s\n\t%s', infile, msg
+                    except verify.VerifyCmpError, e:
                        print(e)
                        verify_failed_files += 1
                        os.rename(current_outfile, current_outfile + '_unverified')
                        sys.stderr.write("### Error Verifying %s\n" % filename)
                        sys.stderr.write(str(e) + "\n")
                        if not outfile:
+                            sys.stder.write("### Error Verifiying %s" %
+                                            filename)
+                            sys.stderr.write(e)
                            if raise_on_error:
                                raise
                            pass
                        pass
                pass
            elif do_verify:
-                sys.stderr.write("\n### uncompile successful, but no file to compare against\n")
+                sys.stderr.write("\n### uncompile successful, "
+                                 "but no file to compare against")
                pass
            else:
                okay_files += 1
--- a/uncompyle6/parser.py
+++ b/uncompyle6/parser.py
@@ -6,8 +6,6 @@
 Common uncompyle parser routines.
 """

-from __future__ import print_function
-
 import sys

 from xdis.code import iscode
@@ -30,13 +28,13 @@ class PythonParser(GenericASTBuilder):

    def __init__(self, AST, start, debug):
        super(PythonParser, self).__init__(AST, start, debug)
-        self.collect = frozenset(
-            ['stmts', 'except_stmts', '_stmts', 'load_attrs',
-             'exprlist', 'kvlist', 'kwargs', 'come_froms', '_come_from',
-              # Python < 3
-             'print_items',
-             # PyPy:
-             'kvlist_n'])
+        self.collect = [
+            'stmts', 'except_stmts', '_stmts', 'load_attrs',
+            'exprlist', 'kvlist', 'kwargs', 'come_froms', '_come_from',
+            # Python < 3
+            'print_items',
+            # PyPy:
+            'kvlist_n']

    def ast_first_offset(self, ast):
        if hasattr(ast, 'offset'):
@@ -92,7 +90,10 @@ class PythonParser(GenericASTBuilder):
        def fix(c):
            s = str(c)
            i = s.find('_')
-            return s if i == -1 else s[:i]
+            if i == -1:
+                return s
+            else:
+                return s[:i]

        prefix = ''
        if parent and tokens:
@@ -123,7 +124,10 @@ class PythonParser(GenericASTBuilder):
        err_token = instructions[index]
        print("Instruction context:")
        for i in range(start, finish):
-            indent = '   ' if i != index else '-> '
+            if i != index:
+                indent = '   '
+            else:
+                indent = '-> '
            print("%s%s" % (indent, instructions[i]))
        raise ParserError(err_token, err_token.offset)

--- a/uncompyle6/parsers/parse2.py
+++ b/uncompyle6/parsers/parse2.py
@@ -12,8 +12,6 @@ If we succeed in creating a parse tree, then we have a Python program
 that a later phase can turn into a sequence of ASCII text.
 """

-from __future__ import print_function
-
 from uncompyle6.parser import PythonParser, PythonParserSingle, nop_func
 from uncompyle6.parsers.astnode import AST
 from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG
--- a/uncompyle6/parsers/parse26.py
+++ b/uncompyle6/parsers/parse26.py
@@ -84,6 +84,12 @@ class Python26Parser(Python2Parser):
        ja_cf_pop ::= JUMP_ABSOLUTE come_froms POP_TOP
        jf_cf_pop ::= JUMP_FORWARD come_froms POP_TOP

+        # The first optional COME_FROM when it appears is really
+        # COME_FROM_LOOP, but in <= 2.6 we don't distinguish
+        # this
+
+        cf_jb_cf_pop ::= _come_from JUMP_BACK come_froms POP_TOP
+
        bp_come_from    ::= POP_BLOCK COME_FROM
        jb_bp_come_from ::= JUMP_BACK bp_come_from

@@ -111,7 +117,8 @@ class Python26Parser(Python2Parser):
        break_stmt ::= BREAK_LOOP JUMP_BACK

        # Semantic actions want else_suitel to be at index 3
-        ifelsestmtl ::= testexpr c_stmts_opt jb_cf_pop else_suitel
+        ifelsestmtl ::= testexpr c_stmts_opt cf_jb_cf_pop else_suitel
+
        ifelsestmtc ::= testexpr c_stmts_opt ja_cf_pop else_suitec

        # Semantic actions want suite_stmts_opt to be at index 3
--- a/uncompyle6/parsers/parse3.py
+++ b/uncompyle6/parsers/parse3.py
@@ -15,8 +15,6 @@ If we succeed in creating a parse tree, then we have a Python program
 that a later phase can turn into a sequence of ASCII text.
 """

-from __future__ import print_function
-
 from uncompyle6.parser import PythonParser, PythonParserSingle, nop_func
 from uncompyle6.parsers.astnode import AST
 from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG
@@ -537,7 +535,10 @@ class Python3Parser(PythonParser):
        """Python 3.3 added a an addtional LOAD_CONST before MAKE_FUNCTION and
        this has an effect on many rules.
        """
-        new_rule = rule % (('LOAD_CONST ') * (1 if  self.version >= 3.3 else 0))
+        if self.version >= 3.3:
+            new_rule = rule % (('LOAD_CONST ') * 1)
+        else:
+            new_rule = rule % (('LOAD_CONST ') * 0)
        self.add_unique_rule(new_rule, opname, attr, customize)

    def add_custom_rules(self, tokens, customize):
@@ -889,7 +890,8 @@ class Python3Parser(PythonParser):
        elif lhs == 'annotate_tuple':
            return not isinstance(tokens[first].attr, tuple)
        elif lhs == 'kwarg':
-            return not isinstance(tokens[first].attr, str)
+            return not (isinstance(tokens[first].attr, unicode) or
+                        isinstance(tokens[first].attr, str))
        elif lhs == 'while1elsestmt':
            # if SETUP_LOOP target spans the else part, then this is
            # not while1else. Also do for whileTrue?
--- a/uncompyle6/parsers/parse30.py
+++ b/uncompyle6/parsers/parse30.py
@@ -2,7 +2,6 @@
 """
 spark grammar differences over Python 3.1 for Python 3.0.
 """
-from __future__ import print_function

 from uncompyle6.parser import PythonParserSingle
 from uncompyle6.parsers.parse31 import Python31Parser
--- a/uncompyle6/parsers/parse31.py
+++ b/uncompyle6/parsers/parse31.py
@@ -2,7 +2,6 @@
 """
 spark grammar differences over Python 3.2 for Python 3.1.
 """
-from __future__ import print_function

 from uncompyle6.parser import PythonParserSingle
 from uncompyle6.parsers.parse32 import Python32Parser
--- a/uncompyle6/parsers/parse32.py
+++ b/uncompyle6/parsers/parse32.py
@@ -2,8 +2,6 @@
 """
 spark grammar differences over Python 3 for Python 3.2.
 """
-from __future__ import print_function
-
 from uncompyle6.parser import PythonParserSingle
 from uncompyle6.parsers.parse3 import Python3Parser

--- a/uncompyle6/parsers/parse33.py
+++ b/uncompyle6/parsers/parse33.py
@@ -2,7 +2,6 @@
 """
 spark grammar differences over Python 3.2 for Python 3.3.
 """
-from __future__ import print_function

 from uncompyle6.parser import PythonParserSingle
 from uncompyle6.parsers.parse32 import Python32Parser
--- a/uncompyle6/parsers/parse35.py
+++ b/uncompyle6/parsers/parse35.py
@@ -2,7 +2,6 @@
 """
 spark grammar differences over Python 3.4 for Python 3.5.
 """
-from __future__ import print_function

 from uncompyle6.parser import PythonParserSingle
 from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG
--- a/uncompyle6/parsers/parse36.py
+++ b/uncompyle6/parsers/parse36.py
@@ -2,7 +2,6 @@
 """
 spark grammar differences over Python 3.5 for Python 3.6.
 """
-from __future__ import print_function

 from uncompyle6.parser import PythonParserSingle
 from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG
--- a/uncompyle6/scanner.py
+++ b/uncompyle6/scanner.py
@@ -1,4 +1,4 @@
-#  Copyright (c) 2016 by Rocky Bernstein
+#  Copyright (c) 2016-2017 by Rocky Bernstein
 #  Copyright (c) 2005 by Dan Pascu <dan@windowmaker.org>
 #  Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com>
 #  Copyright (c) 1999 John Aycock
@@ -10,8 +10,6 @@ scanner/ingestion module. From here we call various version-specific
 scanners, e.g. for Python 2.7 or 3.4.
 """

-from __future__ import print_function
-
 import sys

 from uncompyle6 import PYTHON3, IS_PYPY
@@ -89,7 +87,7 @@ class Scanner(object):
        if op is None:
            op = self.code[pos]
        target = self.get_argument(pos)
-        if op in self.opc.hasjrel:
+        if op in self.opc.JREL_OPS:
            target += pos + 3
        return target

@@ -100,7 +98,7 @@ class Scanner(object):
    def print_bytecode(self):
        for i in self.op_range(0, len(self.code)):
            op = self.code[i]
-            if op in self.opc.hasjabs+self.opc.hasjrel:
+            if op in self.JUMP_OPs:
                dest = self.get_target(i, op)
                print('%i\t%s\t%i' % (i, self.opname[op], dest))
            else:
--- a/uncompyle6/scanners/pypy32.py
+++ b/uncompyle6/scanners/pypy32.py
@@ -1,22 +1,18 @@
-#  Copyright (c) 2016 by Rocky Bernstein
+#  Copyright (c) 2017 by Rocky Bernstein
 """
-Python PyPy 3.2 bytecode scanner/deparser
+Python PyPy 3.2 decompiler scanner.

-This overlaps Python's 3.2's dis module, but it can be run from
-Python 3 and other versions of Python. Also, we save token
-information for later use in deparsing.
+Does some additional massaging of xdis-disassembled instructions to
+make things easier for decompilation.
 """

 import uncompyle6.scanners.scanner32 as scan

 # bytecode verification, verify(), uses JUMP_OPs from here
-from xdis.opcodes import opcode_32 as opc  # is this rgith?
+from xdis.opcodes import opcode_32 as opc  # is this right?
 JUMP_OPs = map(lambda op: opc.opname[op], opc.hasjrel + opc.hasjabs)

-# We base this off of 2.6 instead of the other way around
-# because we cleaned things up this way.
-# The history is that 2.7 support is the cleanest,
-# then from that we got 2.6 and so on.
+# We base this off of 3.2
 class ScannerPyPy32(scan.Scanner32):
    def __init__(self, show_asm):
        # There are no differences in initialization between
--- a/uncompyle6/scanners/pypy35.py
+++ b/uncompyle6/scanners/pypy35.py
@@ -0,0 +1,22 @@
+#  Copyright (c) 2017 by Rocky Bernstein
+"""
+Python PyPy 3.2 decompiler scanner.
+
+Does some additional massaging of xdis-disassembled instructions to
+make things easier for decompilation.
+"""
+
+import uncompyle6.scanners.scanner35 as scan
+
+# bytecode verification, verify(), uses JUMP_OPs from here
+from xdis.opcodes import opcode_35 as opc  # is this right?
+JUMP_OPs = map(lambda op: opc.opname[op], opc.hasjrel + opc.hasjabs)
+
+# We base this off of 3.5
+class ScannerPyPy35(scan.Scanner35):
+    def __init__(self, show_asm):
+        # There are no differences in initialization between
+        # pypy 3.5 and 3.5
+        scan.Scanner35.__init__(self, show_asm, is_pypy=True)
+        self.version = 3.5
+        return
--- a/uncompyle6/scanners/scanner15.py
+++ b/uncompyle6/scanners/scanner15.py
@@ -1,6 +1,6 @@
-#  Copyright (c) 2016 by Rocky Bernstein
+#  Copyright (c) 2016-2017 by Rocky Bernstein
 """
-Python 1.5 bytecode scanner/deparser
+Python 1.5 bytecode decompiler scanner.

 This massages tokenized 1.5 bytecode to make it more amenable for
 grammar parsing.
@@ -13,13 +13,13 @@ import uncompyle6.scanners.scanner21 as scan
 from xdis.opcodes import opcode_15
 JUMP_OPs = opcode_15.JUMP_OPs

-# We base this off of 2.2 instead of the other way around
+# We base this off of 2.1 instead of the other way around
 # because we cleaned things up this way.
 # The history is that 2.7 support is the cleanest,
 # then from that we got 2.6 and so on.
 class Scanner15(scan.Scanner21):
    def __init__(self, show_asm=False):
-        scan.Scanner21.__init__(self, show_asm)
+        scan.Scanner21.__init__(self, show_asm=False)
        self.opc = opcode_15
        self.opname = opcode_15.opname
        self.version = 1.5
--- a/uncompyle6/scanners/scanner2.py
+++ b/uncompyle6/scanners/scanner2.py
@@ -20,9 +20,13 @@ For example:
 Finally we save token information.
 """

-from __future__ import print_function
+from uncompyle6 import PYTHON_VERSION
+
+if PYTHON_VERSION < 2.6:
+    from xdis.namedtuple24 import namedtuple
+else:
+    from collections import namedtuple

-from collections import namedtuple
 from array import array

 from uncompyle6.scanner import L65536
@@ -85,7 +89,9 @@ class Scanner2(Scanner):
        cause specific rules for the specific number of arguments they take.
        """

-        show_asm = self.show_asm if not show_asm else show_asm
+        if not show_asm:
+            show_asm = self.show_asm
+
        # show_asm = 'after'
        if show_asm in ('both', 'before'):
            from xdis.bytecode import Bytecode
@@ -189,7 +195,7 @@ class Scanner2(Scanner):
                if op == self.opc.EXTENDED_ARG:
                    extended_arg = oparg * L65536
                    continue
-                if op in self.opc.hasconst:
+                if op in self.opc.CONST_OPS:
                    const = co.co_consts[oparg]
                    if iscode(const):
                        oparg = const
@@ -210,23 +216,23 @@ class Scanner2(Scanner):
                        pattr = '<code_object ' + const.co_name + '>'
                    else:
                        pattr = const
-                elif op in self.opc.hasname:
+                elif op in self.opc.NAME_OPS:
                    pattr = names[oparg]
-                elif op in self.opc.hasjrel:
+                elif op in self.opc.JREL_OPS:
                    #  use instead: hasattr(self, 'patch_continue'): ?
                    if self.version == 2.7:
                        self.patch_continue(tokens, offset, op)
                    pattr = repr(offset + 3 + oparg)
-                elif op in self.opc.hasjabs:
+                elif op in self.opc.JABS_OPS:
                    # use instead: hasattr(self, 'patch_continue'): ?
                    if self.version == 2.7:
                        self.patch_continue(tokens, offset, op)
                    pattr = repr(oparg)
-                elif op in self.opc.haslocal:
+                elif op in self.opc.LOCAL_OPS:
                    pattr = varnames[oparg]
-                elif op in self.opc.hascompare:
+                elif op in self.opc.COMPARE_OPS:
                    pattr = self.opc.cmp_op[oparg]
-                elif op in self.opc.hasfree:
+                elif op in self.opc.FREE_OPS:
                    pattr = free[oparg]

            if op in self.varargs_ops:
@@ -452,7 +458,7 @@ class Scanner2(Scanner):
                    self.not_continue.add(jmp)
                    jmp = self.get_target(jmp)
                    prev_offset = self.prev[except_match]
-                    # COMPARE_OP argument should be "exception match" or 10
+                    # COMPARE_OP argument should be "exception-match" or 10
                    if (self.code[prev_offset] == self.opc.COMPARE_OP and
                        self.code[prev_offset+1] != 10):
                        return None
@@ -603,7 +609,7 @@ class Scanner2(Scanner):

                    if test == offset:
                        loop_type = 'while 1'
-                    elif self.code[test] in self.opc.hasjabs + self.opc.hasjrel:
+                    elif self.code[test] in self.opc.JUMP_OPs:
                        self.ignore_if.add(test)
                        test_target = self.get_target(test)
                        if test_target > (jump_back+3):
@@ -905,7 +911,9 @@ class Scanner2(Scanner):
                                         'start': start-3,
                                         'end':   pre_rtarget})

-                self.not_continue.add(pre_rtarget)
+                # FIXME: this is yet another case were we need dominators.
+                if pre_rtarget not in self.linestartoffsets or self.version < 2.7:
+                    self.not_continue.add(pre_rtarget)

                if rtarget < end:
                    # We have an "else" block  of some kind.
@@ -992,11 +1000,11 @@ class Scanner2(Scanner):
                oparg = self.get_argument(offset)

                if label is None:
-                    if op in self.opc.hasjrel and self.op_name(op) != 'FOR_ITER':
-                        # if (op in self.opc.hasjrel and
+                    if op in self.opc.JREL_OPS and self.op_name(op) != 'FOR_ITER':
+                        # if (op in self.opc.JREL_OPS and
                        #     (self.version < 2.0 or op != self.opc.FOR_ITER)):
                        label = offset + 3 + oparg
-                    elif self.version == 2.7 and op in self.opc.hasjabs:
+                    elif self.version == 2.7 and op in self.opc.JABS_OPS:
                        if op in (self.opc.JUMP_IF_FALSE_OR_POP,
                                  self.opc.JUMP_IF_TRUE_OR_POP):
                            if (oparg > offset):
@@ -1024,8 +1032,10 @@ class Scanner2(Scanner):

                            # FIXME: rocky: I think we need something like this...
                            if offset not in set(self.ignore_if) or self.version == 2.7:
-                                source = (self.setup_loops[label]
-                                          if label in self.setup_loops else offset)
+                                if label in self.setup_loops:
+                                    source = self.setup_loops[label]
+                                else:
+                                    source = offset
                                targets[label] = targets.get(label, []) + [source]
                            pass

--- a/uncompyle6/scanners/scanner21.py
+++ b/uncompyle6/scanners/scanner21.py
@@ -19,7 +19,7 @@ JUMP_OPs = opcode_21.JUMP_OPs
 # then from that we got 2.6 and so on.
 class Scanner21(scan.Scanner22):
    def __init__(self, show_asm=False):
-        scan.Scanner22.__init__(self, show_asm)
+        scan.Scanner22.__init__(self, show_asm=False)
        self.opc = opcode_21
        self.opname = opcode_21.opname
        self.version = 2.1
--- a/uncompyle6/scanners/scanner22.py
+++ b/uncompyle6/scanners/scanner22.py
@@ -19,7 +19,7 @@ JUMP_OPs = opcode_22.JUMP_OPs
 # then from that we got 2.6 and so on.
 class Scanner22(scan.Scanner23):
    def __init__(self, show_asm=False):
-        scan.Scanner23.__init__(self, show_asm)
+        scan.Scanner23.__init__(self, show_asm=False)
        self.opc = opcode_22
        self.opname = opcode_22.opname
        self.version = 2.2
--- a/uncompyle6/scanners/scanner26.py
+++ b/uncompyle6/scanners/scanner26.py
@@ -87,7 +87,9 @@ class Scanner26(scan.Scanner2):
        cause specific rules for the specific number of arguments they take.
        """

-        show_asm = self.show_asm if not show_asm else show_asm
+        if not show_asm:
+            show_asm = self.show_asm
+
        # show_asm = 'after'
        if show_asm in ('both', 'before'):
            from xdis.bytecode import Bytecode
@@ -181,7 +183,7 @@ class Scanner26(scan.Scanner2):
                if op == self.opc.EXTENDED_ARG:
                    extended_arg = oparg * L65536
                    continue
-                if op in self.opc.hasconst:
+                if op in self.opc.CONST_OPS:
                    const = co.co_consts[oparg]
                    # We can't use inspect.iscode() because we may be
                    # using a different version of Python than the
@@ -206,9 +208,9 @@ class Scanner26(scan.Scanner2):
                        pattr = '<code_object ' + const.co_name + '>'
                    else:
                        pattr = const
-                elif op in self.opc.hasname:
+                elif op in self.opc.NAME_OPS:
                    pattr = names[oparg]
-                elif op in self.opc.hasjrel:
+                elif op in self.opc.JREL_OPS:
                    pattr = repr(offset + 3 + oparg)
                    if op == self.opc.JUMP_FORWARD:
                        target = self.get_target(offset)
@@ -218,13 +220,13 @@ class Scanner26(scan.Scanner2):
                        if len(tokens) and tokens[-1].type == 'JUMP_BACK':
                            tokens[-1].type = intern('CONTINUE')

-                elif op in self.opc.hasjabs:
+                elif op in self.opc.JABS_OPS:
                    pattr = repr(oparg)
-                elif op in self.opc.haslocal:
+                elif op in self.opc.LOCAL_OPS:
                    pattr = varnames[oparg]
-                elif op in self.opc.hascompare:
+                elif op in self.opc.COMPARE_OPS:
                    pattr = self.opc.cmp_op[oparg]
-                elif op in self.opc.hasfree:
+                elif op in self.opc.FREE_OPS:
                    pattr = free[oparg]
            if op in self.varargs_ops:
                # CE - Hack for >= 2.5
--- a/uncompyle6/scanners/scanner27.py
+++ b/uncompyle6/scanners/scanner27.py
@@ -7,8 +7,6 @@ grammar parsing.
 """


-from __future__ import print_function
-
 from uncompyle6.scanners.scanner2 import Scanner2

 from uncompyle6 import PYTHON3
--- a/uncompyle6/scanners/scanner3.py
+++ b/uncompyle6/scanners/scanner3.py
@@ -20,9 +20,13 @@ For example:
 Finally we save token information.
 """

-from __future__ import print_function
+from uncompyle6 import PYTHON_VERSION
+
+if PYTHON_VERSION < 2.6:
+    from xdis.namedtuple24 import namedtuple
+else:
+    from collections import namedtuple

-from collections import namedtuple
 from array import array

 from uncompyle6.scanner import Scanner
@@ -162,8 +166,10 @@ class Scanner3(Scanner):
        cause specific rules for the specific number of arguments they take.
        """

-        show_asm = self.show_asm if not show_asm else show_asm
-        # show_asm = 'both'
+        if not show_asm:
+            show_asm = self.show_asm
+
+        # show_asm = 'after'
        if show_asm in ('both', 'before'):
            bytecode = Bytecode(co, self.opc)
            for instr in bytecode.get_instructions(co):
@@ -633,11 +639,11 @@ class Scanner3(Scanner):
        rel_offset = 0
        if self.version  >= 3.6:
            target = self.code[offset+1]
-            if op in self.opc.hasjrel:
+            if op in self.opc.JREL_OPS:
                rel_offset = offset + 2
        else:
            target = self.code[offset+1] + self.code[offset+2] * 256
-            if op in self.opc.hasjrel:
+            if op in self.opc.JREL_OPS:
                rel_offset = offset + 3
                pass
            pass
@@ -921,7 +927,7 @@ class Scanner3(Scanner):
                # except block return
                jump_prev = prev_op[offset]
                if self.is_pypy and code[jump_prev] == self.opc.COMPARE_OP:
-                    if self.opc.cmp_op[code[jump_prev+1]] == 'exception match':
+                    if self.opc.cmp_op[code[jump_prev+1]] == 'exception-match':
                        return
                if self.version >= 3.5:
                    # Python 3.5 may remove as dead code a JUMP
--- a/uncompyle6/scanners/scanner30.py
+++ b/uncompyle6/scanners/scanner30.py
@@ -6,8 +6,6 @@ This sets up opcodes Python's 3.0 and calls a generalized
 scanner routine for Python 3.
 """

-from __future__ import print_function
-
 # bytecode verification, verify(), uses JUMP_OPs from here
 from xdis.opcodes import opcode_30 as opc
 from xdis.bytecode import op_size
@@ -120,7 +118,7 @@ class Scanner30(Scanner3):

                    if test == offset:
                        loop_type = 'while 1'
-                    elif self.code[test] in opc.hasjabs+opc.hasjrel:
+                    elif self.code[test] in opc.JUMP_OPs:
                        self.ignore_if.add(test)
                        test_target = self.get_target(test)
                        if test_target > (jump_back+3):
@@ -295,7 +293,7 @@ class Scanner30(Scanner3):
                # except block return
                jump_prev = prev_op[offset]
                if self.is_pypy and code[jump_prev] == self.opc.COMPARE_OP:
-                    if self.opc.cmp_op[code[jump_prev+1]] == 'exception match':
+                    if self.opc.cmp_op[code[jump_prev+1]] == 'exception-match':
                        return
                if self.version >= 3.5:
                    # Python 3.5 may remove as dead code a JUMP
--- a/uncompyle6/scanners/scanner31.py
+++ b/uncompyle6/scanners/scanner31.py
@@ -6,8 +6,6 @@ This sets up opcodes Python's 3.1 and calls a generalized
 scanner routine for Python 3.
 """

-from __future__ import print_function
-
 # bytecode verification, verify(), uses JUMP_OPs from here
 from xdis.opcodes import opcode_31 as opc
 JUMP_OPs = map(lambda op: opc.opname[op], opc.hasjrel + opc.hasjabs)
--- a/uncompyle6/scanners/scanner32.py
+++ b/uncompyle6/scanners/scanner32.py
@@ -1,13 +1,14 @@
-#  Copyright (c) 2015-2016 by Rocky Bernstein
+#  Copyright (c) 2015-2017 by Rocky Bernstein
 """
-Python 3.2 bytecode scanner/deparser
+Python 3.2 bytecode decompiler scanner.
+
+Does some additional massaging of xdis-disassembled instructions to
+make things easier for decompilation.

 This sets up opcodes Python's 3.2 and calls a generalized
 scanner routine for Python 3.
 """

-from __future__ import print_function
-
 # bytecode verification, verify(), uses JUMP_OPs from here
 from xdis.opcodes import opcode_32 as opc
 JUMP_OPs = map(lambda op: opc.opname[op], opc.hasjrel + opc.hasjabs)
--- a/uncompyle6/scanners/scanner33.py
+++ b/uncompyle6/scanners/scanner33.py
@@ -6,8 +6,6 @@ This sets up opcodes Python's 3.3 and calls a generalized
 scanner routine for Python 3.
 """

-from __future__ import print_function
-
 # bytecode verification, verify(), uses JUMP_OPs from here
 from xdis.opcodes import opcode_33 as opc
 JUMP_OPs = map(lambda op: opc.opname[op], opc.hasjrel + opc.hasjabs)
--- a/uncompyle6/scanners/scanner34.py
+++ b/uncompyle6/scanners/scanner34.py
@@ -1,13 +1,14 @@
-#  Copyright (c) 2015-2016 by Rocky Bernstein
+#  Copyright (c) 2015-2017 by Rocky Bernstein
 """
-Python 3.4 bytecode scanner/deparser
+Python 3.4 bytecode decompiler scanner
+
+Does some additional massaging of xdis-disassembled instructions to
+make things easier for decompilation.

 This sets up opcodes Python's 3.4 and calls a generalized
 scanner routine for Python 3.
 """

-from __future__ import print_function
-
 from xdis.opcodes import opcode_34 as opc

 # bytecode verification, verify(), uses JUMP_OPs from here
--- a/uncompyle6/scanners/scanner35.py
+++ b/uncompyle6/scanners/scanner35.py
@@ -1,13 +1,14 @@
-#  Copyright (c) 2016 by Rocky Bernstein
+#  Copyright (c) 2017 by Rocky Bernstein
 """
-Python 3.5 bytecode scanner/deparser
+Python 3.5 bytecode decompiler scanner
+
+Does some additional massaging of xdis-disassembled instructions to
+make things easier for decompilation.

 This sets up opcodes Python's 3.5 and calls a generalized
 scanner routine for Python 3.
 """

-from __future__ import print_function
-
 from uncompyle6.scanners.scanner3 import Scanner3

 # bytecode verification, verify(), uses JUMP_OPs from here
@@ -16,8 +17,8 @@ JUMP_OPs = map(lambda op: opc.opname[op], opc.hasjrel + opc.hasjabs)

 class Scanner35(Scanner3):

-    def __init__(self, show_asm=None):
-        Scanner3.__init__(self, 3.5, show_asm)
+    def __init__(self, show_asm=None, is_pypy=False):
+        Scanner3.__init__(self, 3.5, show_asm, is_pypy)
        return
    pass

--- a/uncompyle6/scanners/scanner36.py
+++ b/uncompyle6/scanners/scanner36.py
@@ -1,13 +1,14 @@
 #  Copyright (c) 2016-2017 by Rocky Bernstein
 """
-Python 3.6 bytecode scanner/deparser
+Python 3.6 bytecode decompiler scanner
+
+Does some additional massaging of xdis-disassembled instructions to
+make things easier for decompilation.

 This sets up opcodes Python's 3.6 and calls a generalized
 scanner routine for Python 3.
 """

-from __future__ import print_function
-
 from uncompyle6.scanners.scanner3 import Scanner3

 # bytecode verification, verify(), uses JUMP_OPs from here
--- a/uncompyle6/scanners/tok.py
+++ b/uncompyle6/scanners/tok.py
@@ -56,19 +56,25 @@ class Token:
        return self.format(line_prefix='')

    def format(self, line_prefix=''):
-        prefix = ('\n%s%4d  ' % (line_prefix, self.linestart)
-                  if self.linestart else (' ' * (6 + len(line_prefix))))
+        if self.linestart:
+            prefix = '\n%s%4d  ' % (line_prefix, self.linestart)
+        else:
+            prefix = ' ' * (6 + len(line_prefix))
        offset_opname = '%6s  %-17s' % (self.offset, self.type)
        if not self.has_arg:
            return "%s%s" % (prefix, offset_opname)
-        argstr = "%6d " % self.attr if isinstance(self.attr, int) else (' '*7)
+
+        if isinstance(self.attr, int):
+            argstr = "%6d " % self.attr
+        else:
+            argstr = ' '*7
        if self.pattr:
            pattr = self.pattr
            if self.opc:
-                if self.op in self.opc.hasjrel:
+                if self.op in self.opc.JREL_OPS:
                    if not self.pattr.startswith('to '):
                        pattr = "to " + self.pattr
-                elif self.op in self.opc.hasjabs:
+                elif self.op in self.opc.JABS_OPS:
                    self.pattr= str(self.pattr)
                    if not self.pattr.startswith('to '):
                        pattr = "to " + str(self.pattr)
--- a/uncompyle6/semantics/consts.py
+++ b/uncompyle6/semantics/consts.py
@@ -176,7 +176,7 @@ TABLE_DIRECT = {
    'ret_cond_not':  ( '%p if not %p else %p', (2, 27), (0, 22), (-1, 27)),
    'conditional_lambda':  ( '(%c if %c else %c)', 2, 0, 3),
    'return_lambda':    ('%c', 0),
-    'compare':		( '%p %[-1]{pattr} %p', (0, 19), (1, 19) ),
+    'compare':		( '%p %[-1]{pattr.replace("-", " ")} %p', (0, 19), (1, 19) ),
    'cmp_list':		( '%p %p', (0, 29), (1, 30)),
    'cmp_list1':	( '%[3]{pattr} %p %p', (0, 19), (-2, 19)),
    'cmp_list2':	( '%[1]{pattr} %p', (0, 19)),
--- a/uncompyle6/semantics/fragments.py
+++ b/uncompyle6/semantics/fragments.py
@@ -51,8 +51,6 @@ The node position 0 will be associated with "import".

 # FIXME: DRY code with pysource

-from __future__ import print_function
-
 import re, sys

 from xdis.code import iscode
@@ -79,7 +77,12 @@ from uncompyle6.semantics.consts import (
 from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG
 from spark_parser.ast import GenericASTTraversalPruningException

-from collections import namedtuple
+from uncompyle6 import PYTHON_VERSION
+if PYTHON_VERSION < 2.6:
+    from xdis.namedtuple24 import namedtuple
+else:
+    from collections import namedtuple
+
 NodeInfo = namedtuple("NodeInfo", "node start finish")
 ExtractInfo = namedtuple("ExtractInfo",
                         "lineNo lineStartOffset markerLine selectedLine selectedText nonterminal")
@@ -772,7 +775,10 @@ class FragmentsWalker(pysource.SourceWalker, object):
    def n_genexpr(self, node):
        start = len(self.f.getvalue())
        self.write('(')
-        code_index = -6 if self.version > 3.2 else -5
+        if self.version > 3.2:
+            code_index = -6
+        else:
+            code_index = -5
        self.comprehension_walk(node, iter_index=3, code_index=code_index)
        self.write(')')
        self.set_pos_info(node, start, len(self.f.getvalue()))
@@ -926,7 +932,10 @@ class FragmentsWalker(pysource.SourceWalker, object):
                        subclass = n.attr
                        break
                    pass
-                subclass_info = node if node == 'classdefdeco2' else node[0]
+                if node == 'classdefdeco2':
+                    subclass_info = node
+                else:
+                    subclass_info = node[0]
            elif buildclass[1][0] == 'load_closure':
                # Python 3 with closures not functions
                load_closure = buildclass[1]
@@ -950,7 +959,10 @@ class FragmentsWalker(pysource.SourceWalker, object):
                subclass = buildclass[1][0].attr
                subclass_info = node[0]
        else:
-            buildclass = node if (node == 'classdefdeco2') else node[0]
+            if node == 'classdefdeco2':
+                buildclass = node
+            else:
+                buildclass = node[0]
            build_list = buildclass[1][0]
            if hasattr(buildclass[-3][0], 'attr'):
                subclass = buildclass[-3][0].attr
@@ -1016,7 +1028,9 @@ class FragmentsWalker(pysource.SourceWalker, object):
            tokens.append(Token('LAMBDA_MARKER'))
            try:
                ast = parser.parse(self.p, tokens, customize)
-            except (parser.ParserError, AssertionError) as e:
+            except parser.ParserError(e):
+                raise ParserError(e, tokens)
+            except AssertionError(e):
                raise ParserError(e, tokens)
            maybe_show_ast(self.showast, ast)
            return ast
@@ -1041,7 +1055,9 @@ class FragmentsWalker(pysource.SourceWalker, object):
        # Build AST from disassembly.
        try:
            ast = parser.parse(self.p, tokens, customize)
-        except (parser.ParserError, AssertionError) as e:
+        except parser.ParserError(e):
+            raise ParserError(e, tokens)
+        except AssertionError(e):
            raise ParserError(e, tokens)

        maybe_show_ast(self.showast, ast)
--- a/uncompyle6/semantics/make_function.py
+++ b/uncompyle6/semantics/make_function.py
@@ -6,14 +6,9 @@ All the crazy things we have to do to handle Python functions
 from xdis.code import iscode
 from uncompyle6.scanner import Code
 from uncompyle6.parsers.astnode import AST
-from uncompyle6 import PYTHON3
 from uncompyle6.semantics.parser_error import ParserError
 from uncompyle6.semantics.helper import print_docstring

-if PYTHON3:
-    from itertools import zip_longest
-else:
-    from itertools import izip_longest as zip_longest

 from uncompyle6.show import maybe_show_ast_param_default

@@ -139,7 +134,7 @@ def make_function3_annotate(self, node, isLambda, nested=1,
                             code._customize,
                             isLambda = isLambda,
                             noneInNames = ('None' in code.co_names))
-    except ParserError as p:
+    except ParserError, p:
        self.write(str(p))
        self.ERROR = p
        return
@@ -170,7 +165,7 @@ def make_function3_annotate(self, node, isLambda, nested=1,
        self.write(suffix, param)
        suffix = ', '
        if param in annotate_tuple[0].attr:
-            p = annotate_tuple[0].attr.index(param)
+            p = [x for x in annotate_tuple[0].attr].index(param)
            self.write(': ')
            self.preorder(node[p])
            if (line_number != self.line_number):
@@ -182,7 +177,10 @@ def make_function3_annotate(self, node, isLambda, nested=1,
            # else:
            #     self.write(': %s' % value)

-    suffix = ', ' if i > 0 else ''
+    if i > 0:
+        suffix = ', '
+    else:
+        suffix = ''
    for n in node:
        if n == 'pos_arg':
            no_paramnames = False
@@ -367,17 +365,21 @@ def make_function2(self, node, isLambda, nested=1, codeNode=None):
                             code._customize,
                             isLambda = isLambda,
                             noneInNames = ('None' in code.co_names))
-    except ParserError as p:
+    except ParserError, p:
        self.write(str(p))
        self.ERROR = p
        return

-    kw_pairs = args_node.attr[1] if self.version >= 3.0 else 0
+    if self.version >= 3.0:
+        kw_pairs = args_node.attr[1]
+    else:
+        kw_pairs = 0
    indent = self.indent

    # build parameters
+    tup = [paramnames, defparams]
    params = [build_param(ast, name, default) for
-              name, default in zip_longest(paramnames, defparams, fillvalue=None)]
+              name, default in map(lambda *tup:tup, *tup)]
    params.reverse() # back to correct order

    if code_has_star_arg(code):
@@ -411,7 +413,8 @@ def make_function2(self, node, isLambda, nested=1, codeNode=None):
    if code_has_star_star_arg(code):
        if argc > 0:
            self.write(', ')
-        self.write('**%s' % code.co_varnames[argc + kw_pairs])
+        if argc + kw_pairs > 0:
+            self.write('**%s' % code.co_varnames[argc + kw_pairs])

    if isLambda:
        self.write(": ")
@@ -437,34 +440,10 @@ def make_function2(self, node, isLambda, nested=1, codeNode=None):


 def make_function3(self, node, isLambda, nested=1, codeNode=None):
-    """Dump function definition, doc string, and function body in
-      Python version 3.0 and above
-    """
+    """Dump function definition, doc string, and function body."""

-    # For Python 3.3, the evaluation stack in MAKE_FUNCTION is:
-
-    # * default argument objects in positional order
-    # * pairs of name and default argument, with the name just below
-    #   the object on the stack, for keyword-only parameters
-    # * parameter annotation objects
-    # * a tuple listing the parameter names for the annotations
-    #   (only if there are ony annotation objects)
-    # * the code associated with the function (at TOS1)
-    # * the qualified name of the function (at TOS)
-
-    # For Python 3.0 .. 3.2 the evaluation stack is:
-    # The function object is defined to have argc default parameters,
-    # which are found below TOS.
-    # * first come positional args in the order they are given in the source,
-    # * next come the keyword args in the order they given in the source,
-    # * finally is the code associated with the function (at TOS)
-    #
-    # Note: There is no qualified name at TOS
-
-    # MAKE_CLOSURE adds an additional closure slot
-
-    # Thank you, Python, for a such a well-thought out system that has
-    # changed 4 or so times.
+    # FIXME: call make_function3 if we are self.version >= 3.0
+    # and then simplify the below.

    def build_param(ast, name, default):
        """build parameters:
@@ -484,31 +463,21 @@ def make_function3(self, node, isLambda, nested=1, codeNode=None):
    # MAKE_FUNCTION_... or MAKE_CLOSURE_...
    assert node[-1].type.startswith('MAKE_')

-
-    # Python 3.3+ adds a qualified name at TOS (-1)
-    # moving down the LOAD_LAMBDA instruction
-    if 3.0 <= self.version <= 3.2:
-        lambda_index = -2
-    elif 3.03 <= self.version:
-        lambda_index = -3
-    else:
-        lambda_index = None
-
    args_node = node[-1]
    if isinstance(args_node.attr, tuple):
-        pos_args, kw_args, annotate_argc  = args_node.attr
-        if self.version <= 3.3 and len(node) > 2 and node[lambda_index] != 'LOAD_LAMBDA':
-            # args are after kwargs; kwargs are bundled as one node
+        if self.version <= 3.3 and len(node) > 2 and node[-3] != 'LOAD_LAMBDA':
+            # positional args are after kwargs
            defparams = node[1:args_node.attr[0]+1]
        else:
-            # args are before kwargs; kwags as bundled as one node
+            # positional args are before kwargs
            defparams = node[:args_node.attr[0]]
+        pos_args, kw_args, annotate_argc  = args_node.attr
    else:
        if self.version < 3.6:
            defparams = node[:args_node.attr]
        else:
            default, kw, annotate, closure = args_node.attr
-            # FIXME: start here for Python 3.6 and above:
+            # FIXME: start here.
            defparams = []
            # if default:
            #     defparams = node[-(2 +  kw + annotate  + closure)]
@@ -518,6 +487,12 @@ def make_function3(self, node, isLambda, nested=1, codeNode=None):
        kw_args  = 0
        pass

+    if 3.0 <= self.version <= 3.2:
+        lambda_index = -2
+    elif 3.03 <= self.version:
+        lambda_index = -3
+    else:
+        lambda_index = None

    if lambda_index and isLambda and iscode(node[lambda_index].attr):
        assert node[lambda_index].type == 'LOAD_LAMBDA'
@@ -533,7 +508,7 @@ def make_function3(self, node, isLambda, nested=1, codeNode=None):
    paramnames = list(code.co_varnames[:argc])

    # defaults are for last n parameters, thus reverse
-    if not 3.0 <= self.version <= 3.1:
+    if not 3.0 <= self.version <= 3.2:
        paramnames.reverse(); defparams.reverse()

    try:
@@ -541,33 +516,71 @@ def make_function3(self, node, isLambda, nested=1, codeNode=None):
                             code._customize,
                             isLambda = isLambda,
                             noneInNames = ('None' in code.co_names))
-    except ParserError as p:
+    except ParserError, p:
        self.write(str(p))
        self.ERROR = p
        return

-    kw_pairs = args_node.attr[1] if self.version >= 3.0 else 0
+    if self.version >= 3.0:
+        kw_pairs = args_node.attr[1]
+    else:
+        kw_pairs = 0
+    indent = self.indent

    # build parameters
-    params = [build_param(ast, name, d) for
-              name, d in zip_longest(paramnames, defparams, fillvalue=None)]
-
-    if not 3.0 <= self.version <= 3.1:
+    if self.version != 3.2:
+        tup = [paramnames, defparams]
+        params = [build_param(ast, name, default) for
+              name, default in map(lambda *tup:tup, *tup)]
        params.reverse() # back to correct order

-    if code_has_star_arg(code):
-        if self.version > 3.0:
-            params.append('*%s' % code.co_varnames[argc + kw_pairs])
-        else:
-            params.append('*%s' % code.co_varnames[argc])
-        argc += 1
+        if code_has_star_arg(code):
+            if self.version > 3.0:
+                params.append('*%s' % code.co_varnames[argc + kw_pairs])
+            else:
+                params.append('*%s' % code.co_varnames[argc])
+            argc += 1
+
+        # dump parameter list (with default values)
+        if isLambda:
+            self.write("lambda ", ", ".join(params))
+        else:
+            self.write("(", ", ".join(params))
+        # self.println(indent, '#flags:\t', int(code.co_flags))

-    # dump parameter list (with default values)
-    if isLambda:
-        self.write("lambda ", ", ".join(params))
    else:
-        self.write("(", ", ".join(params))
-    # self.println(indent, '#flags:\t', int(code.co_flags))
+        if isLambda:
+            self.write("lambda ")
+        else:
+            self.write("(")
+            pass
+
+        last_line = self.f.getvalue().split("\n")[-1]
+        l = len(last_line)
+        indent = ' ' * l
+        line_number = self.line_number
+
+        if code_has_star_arg(code):
+            self.write('*%s' % code.co_varnames[argc + kw_pairs])
+            argc += 1
+
+        i = len(paramnames) - len(defparams)
+        self.write(", ".join(paramnames[:i]))
+        if i > 0:
+            suffix = ', '
+        else:
+            suffix = ''
+        for n in node:
+            if n == 'pos_arg':
+                self.write(suffix)
+                self.write(paramnames[i] + '=')
+                i += 1
+                self.preorder(n)
+                if (line_number != self.line_number):
+                    suffix = ",\n" + indent
+                    line_number = self.line_number
+                else:
+                    suffix = ', '

    if kw_args > 0:
        if not (4 & code.co_flags):
--- a/uncompyle6/semantics/pysource.py
+++ b/uncompyle6/semantics/pysource.py
@@ -67,8 +67,6 @@ methods implement most of the below.
  The '%' may optionally be followed by a number (C) in square brackets, which
  makes the engine walk down to N[C] before evaluating the escape code.
 """
-from __future__ import print_function
-
 import sys

 from uncompyle6 import PYTHON3
@@ -956,7 +954,10 @@ class SourceWalker(GenericASTTraversal, object):
                return
            n = node[-1]
        elif node[-1] == 'del_stmt':
-            n = node[-3] if node[-2] == 'JUMP_BACK' else node[-2]
+            if node[-2] == 'JUMP_BACK':
+                n = node[-3]
+            else:
+                n = node[-2]

        assert n == 'list_iter'

@@ -974,7 +975,10 @@ class SourceWalker(GenericASTTraversal, object):
            list_iter = node[-1]
        else:
            expr = n[1]
-            list_iter = node[-3] if node[-2] == 'JUMP_BACK' else node[-2]
+            if node[-2] == 'JUMP_BACK':
+                list_iter = node[-3]
+            else:
+                list_iter = node[-2]

        assert expr == 'expr'
        assert list_iter == 'list_iter'
@@ -1026,7 +1030,10 @@ class SourceWalker(GenericASTTraversal, object):
        self.write( '[ ')

        expr = n[0]
-        list_iter = node[-2] if self.is_pypy and node[-1] == 'JUMP_BACK' else node[-1]
+        if self.is_pypy and node[-1] == 'JUMP_BACK':
+            list_iter = node[-2]
+        else:
+            list_iter = node[-1]

        assert expr == 'expr'
        assert list_iter == 'list_iter'
@@ -1100,7 +1107,10 @@ class SourceWalker(GenericASTTraversal, object):
        self.write(' for ')
        self.preorder(ast[iter_index-1])
        self.write(' in ')
-        iter_expr = node[2] if node[2] == 'expr' else node[-3]
+        if node[2] == 'expr':
+            iter_expr = node[2]
+        else:
+            iter_expr = node[-3]
        assert iter_expr == 'expr'
        self.preorder(iter_expr)
        self.preorder(ast[iter_index])
@@ -1108,7 +1118,10 @@ class SourceWalker(GenericASTTraversal, object):

    def n_genexpr(self, node):
        self.write('(')
-        code_index = -6 if self.version > 3.2 else -5
+        if self.version > 3.2:
+            code_index = -6
+        else:
+            code_index = -5
        self.comprehension_walk(node, iter_index=3, code_index=code_index)
        self.write(')')
        self.prune()
@@ -1349,7 +1362,10 @@ class SourceWalker(GenericASTTraversal, object):
                            break
                        pass
                    pass
-                subclass_info = node if node == 'classdefdeco2' else node[0]
+                if node == 'classdefdeco2':
+                    subclass_info = node
+                else:
+                    subclass_info = node[0]
            elif buildclass[1][0] == 'load_closure':
                # Python 3 with closures not functions
                load_closure = buildclass[1]
@@ -1376,7 +1392,10 @@ class SourceWalker(GenericASTTraversal, object):
                subclass_code = buildclass[1][0].attr
                subclass_info = node[0]
        else:
-            buildclass = node if (node == 'classdefdeco2') else node[0]
+            if node == 'classdefdeco2':
+                buildclass = node
+            else:
+                buildclass = node[0]
            build_list = buildclass[1][0]
            if hasattr(buildclass[-3][0], 'attr'):
                subclass_code = buildclass[-3][0].attr
@@ -2069,7 +2088,9 @@ class SourceWalker(GenericASTTraversal, object):
            tokens.append(Token('LAMBDA_MARKER'))
            try:
                ast = python_parser.parse(self.p, tokens, customize)
-            except (python_parser.ParserError, AssertionError) as e:
+            except python_parser.ParserError, e:
+                raise ParserError(e, tokens)
+            except AssertionError, e:
                raise ParserError(e, tokens)
            maybe_show_ast(self.showast, ast)
            return ast
@@ -2096,7 +2117,9 @@ class SourceWalker(GenericASTTraversal, object):
        # Build AST from disassembly.
        try:
            ast = python_parser.parse(self.p, tokens, customize)
-        except (python_parser.ParserError, AssertionError) as e:
+        except python_parser.ParserError, e:
+            raise ParserError(e, tokens)
+        except AssertionError, e:
            raise ParserError(e, tokens)

        maybe_show_ast(self.showast, ast)
@@ -2174,10 +2197,10 @@ def deparse_code(version, co, out=sys.stdout, showasm=None, showast=False,
 if __name__ == '__main__':
    def deparse_test(co):
        "This is a docstring"
-        sys_version = sys.version_info.major + (sys.version_info.minor / 10.0)
+        sys_version = float(sys.version[0:3])
        deparsed = deparse_code(sys_version, co, showasm='after', showast=True)
        # deparsed = deparse_code(sys_version, co, showasm=None, showast=False,
        #                         showgrammar=True)
        print(deparsed.text)
        return
-    deparse_test(deparse_test.__code__)
+    deparse_test(deparse_test.func_code)
--- a/uncompyle6/show.py
+++ b/uncompyle6/show.py
@@ -12,7 +12,10 @@ def maybe_show_asm(showasm, tokens):
    :param tokens:  The asm tokens to show.
    """
    if showasm:
-        stream = showasm if hasattr(showasm, 'write') else sys.stdout
+        if hasattr(showasm, 'write'):
+            stream = showasm
+        else:
+            stream = sys.stdout
        for t in tokens:
            stream.write(str(t))
            stream.write('\n')
@@ -29,7 +32,10 @@ def maybe_show_ast(showast, ast):
    :param ast:     The ast to show.
    """
    if showast:
-        stream = showast if hasattr(showast, 'write') else sys.stdout
+        if hasattr(showast, 'write'):
+            stream = showast
+        else:
+            stream = sys.stdout
        stream.write(str(ast))
        stream.write('\n')

@@ -48,7 +54,10 @@ def maybe_show_ast_param_default(showast, name, default):
    :param default: The function parameter default.
    """
    if showast:
-        stream = showast if hasattr(showast, 'write') else sys.stdout
+        if hasattr(showast, 'write'):
+            stream = showast
+        else:
+            stream = sys.stdout
        stream.write('\n')
        stream.write('--' + name)
        stream.write('\n')
--- a/uncompyle6/verify.py
+++ b/uncompyle6/verify.py
@@ -6,8 +6,6 @@
 byte-code verification
 """

-from __future__ import print_function
-
 import dis, operator

 import uncompyle6
@@ -365,8 +363,10 @@ def cmp_code_objects(version, is_pypy, code_obj1, code_obj2,
        elif member == 'co_flags':
            flags1 = code_obj1.co_flags
            flags2 = code_obj2.co_flags
-            if is_pypy:
+            if is_pypy or version == 2.4:
                # For PYPY for now we don't care about PYPY_SOURCE_IS_UTF8:
+                # Python 2.4 also sets this flag and I am not sure
+                # where or why
                flags2 &= ~0x0100  # PYPY_SOURCE_IS_UTF8
            # We also don't care about COROUTINE or GENERATOR for now
            flags1 &= ~0x000000a0
@@ -375,6 +375,8 @@ def cmp_code_objects(version, is_pypy, code_obj1, code_obj2,
                raise CmpErrorMember(name, 'co_flags',
                                     pretty_flags(flags1),
                                     pretty_flags(flags2))
+
+
        else:
            # all other members must be equal
            if getattr(code_obj1, member) != getattr(code_obj2, member):
@@ -418,8 +420,10 @@ def compare_code_with_srcfile(pyc_filename, src_filename, weak_verify=False):
        return msg
    try:
        code_obj2 = load_file(src_filename)
-    except SyntaxError as e:
+    except SyntaxError, e:
        # src_filename can be the first of a group sometimes
+        if version == 2.4:
+            print(pyc_filename)
        return str(e).replace(src_filename, pyc_filename)
    cmp_code_objects(version, is_pypy, code_obj1, code_obj2, ignore_code=weak_verify)
    return None
--- a/uncompyle6/version.py
+++ b/uncompyle6/version.py
@@ -1,3 +1,3 @@
 # This file is suitable for sourcing inside bash as
 # well as importing into Python
-VERSION='2.11.1'
+VERSION='2.11.3'
Author	SHA1	Message	Date
rocky	c38dc61021	xdis "is not" is now "is-not"	2017-08-09 22:07:32 -04:00
rocky	45782bbb39	Get ready for release 2.11.3	2017-08-09 21:46:27 -04:00
rocky	4c9cd5657e	Merge branch 'master' into python-2.4	2017-08-09 21:45:50 -04:00
rocky	dc627d13b8	Get ready for release 2.11.3	2017-08-09 21:33:01 -04:00
rocky	ddc3489991	Python 2.4 comptiability and ... exception match -> exception-match	2017-08-03 03:48:57 -04:00
rocky	5b24c20331	Bump xdis	2017-08-02 08:37:50 -04:00
rocky	8bb01143d8	Remove six from python 2.4/2.5	2017-08-02 08:28:08 -04:00
rocky	bb9b3ac9cf	Revert commit to wrong branch	2017-08-02 08:25:39 -04:00
rocky	05ac60ea74	Remove six from Python-2.4/2.5 package	2017-08-02 08:18:54 -04:00
rocky	348afeebbf	Python 2.4 compatibility	2017-08-01 22:32:43 -04:00
rocky	d138a01bf1	xdis's "exception match" is now "exception-match"	2017-07-17 22:42:57 -04:00
rocky	9e8e4f54c7	xdis 3.5.1 is botched?	2017-07-15 00:24:40 -04:00
rocky	a06a5e1cd8	Use newer xdis	2017-07-14 23:45:56 -04:00
R. Bernstein	1048f6a964	Fixes issue #124	2017-07-14 23:43:40 -04:00
rocky	7fed237077	History updates	2017-07-14 08:03:06 -04:00
rocky	8b816ead0d	RsT doc formatting	2017-07-09 02:06:39 -04:00
rocky	300d387349	Get ready for release 2.11.2	2017-07-09 01:44:55 -04:00
rocky	27ab6fe2f5	Use xdis 3.5.0's opcode sets	2017-07-08 20:41:46 -04:00
rocky	2e164763eb	Start supporting Pypy 3.5 (5.7.1-beta)	2017-07-08 17:47:32 -04:00
rocky	d332bde104	Loops in Python 2.4-2.6 loop come_from Looks like Python 2.4-2.6 may have a COME_FROM(_LOOP) before the jump_back. Fixes Issue #123	2017-07-05 06:12:14 -04:00
rocky	0893652943	Work around not having real flow-control analysis	2017-06-29 20:49:01 -04:00
rocky	6efd7afda3	continue non-detection in Python 2.7 fixes issue 122	2017-06-29 20:27:07 -04:00
rocky	ee3202779a	A guard against badly formated bytecode	2017-06-28 18:39:05 -04:00
rocky	6888553773	Merge branch 'master' into python-2.4	2017-06-25 18:56:31 -04:00
rocky	0f489672b9	More merge fixups from master	2017-06-18 16:05:22 -04:00
rocky	b7d8cbfaf5	Merge branch 'master' into python-2.4	2017-06-18 15:40:40 -04:00
rocky	df8d253f78	2.4 doesn't do six	2017-06-03 06:00:47 -04:00
rocky	89b42e3696	Nope it (appveyor) doesn't.	2017-06-03 05:55:21 -04:00
rocky	22e5a4a283	Administrivia See if appveyor will handle 2.5	2017-06-03 05:53:41 -04:00
rocky	61810172d1	Merge branch 'master' into python-2.4	2017-06-03 05:50:42 -04:00
rocky	658c8b4be7	No decorators in Python < 2.6	2017-05-30 02:30:56 -04:00
rocky	d4dab54c7b	Merge branch 'master' into python-2.4	2017-05-30 02:18:57 -04:00
rocky	5566b9ba6c	Get ready for release 2.9.11	2017-05-06 07:49:09 -04:00
rocky	e56ab2dcd5	Sync with master	2017-05-06 07:17:04 -04:00
rocky	d6c45979ba	Merge branch 'master' into python-2.4	2017-05-06 07:16:39 -04:00
rocky	a06e9bf32e	Merge branch 'master' into python-2.4	2017-04-14 05:45:53 -04:00
rocky	7e8f7ba674	namedtuple25 -> namedtuple24	2017-04-14 05:42:44 -04:00
rocky	09eb7f7f78	Merge branch 'master' into python-2.4	2017-04-10 00:48:04 -04:00
rocky	f7a910ec66	Merge branch 'master' into python-2.4	2017-03-01 05:55:26 -05:00
rocky	6d6a73eea7	Merge branch 'master' into python-2.4	2017-02-25 21:02:12 -05:00
rocky	e4a7641927	Python <= 2.6 grammar fixes	2017-02-25 05:13:19 -05:00
rocky	b24b46d48c	Merge branch 'master' into python-2.4	2017-02-25 04:48:06 -05:00
rocky	a65d7dce5b	Python 2.5 was missing try else stmt	2017-02-22 05:30:07 -05:00
rocky	718a0a5d34	Merge branch 'master' into python-2.4	2017-02-22 05:29:49 -05:00
rocky	ea9e3ab3f5	Group coverage Makefile targets	2017-02-10 01:00:26 -05:00
rocky	770e988ff8	Changes based on coverage information	2017-01-29 22:54:30 -05:00
rocky	0fa0641974	Merge branch 'master' into python-2.4	2017-01-29 22:05:55 -05:00
rocky	c13e23cdae	Get ready for release 2.9.9	2017-01-11 21:52:20 -05:00
rocky	fab4ebb768	Merge changes ... * str() in Python 2.4 doesn't detect unicode. * index() doesn't work on tuples * ifelse change	2017-01-11 19:34:28 -05:00
rocky	89429339fa	Merge branch 'master' into python-2.4	2017-01-11 19:25:44 -05:00
rocky	6ed129bd7a	2.4 verify hacks	2017-01-02 07:15:46 -05:00
rocky	c4fde6b53e	Merge branch 'master' into python-2.4	2017-01-02 05:39:50 -05:00
rocky	a7d93e88b4	Merge branch 'master' into python-2.4	2017-01-02 05:39:13 -05:00
rocky	9891494142	We are version 2.9.9	2016-12-31 18:16:23 -05:00
rocky	f8544dfbbe	2.7->2.4 conversion	2016-12-31 10:56:43 -05:00
rocky	b00651d428	Merge master branche Handle 2.2 list_if	2016-12-31 05:19:21 -05:00
rocky	da8dccbaca	Merge branch 'master' into python-2.4	2016-12-29 02:08:12 -05:00
rocky	37272ae827	Merge commit '9b1dd0f' into python-2.4	2016-12-27 10:32:25 -05:00
rocky	7f2bee46b7	Bug in using python2 ast checking in python 2.5	2016-12-26 01:55:16 -05:00
rocky	c8a4dcf72b	Removing NAME_MODULE, lint and bug fixes scanner*.py: show_asm param is optional verify.py: call correct scanners main.py, verify.py: Use older Python print statements	2016-12-25 09:16:04 -05:00
rocky	012ff91cfb	Merge branch 'master' into python-2.4	2016-12-25 07:57:17 -05:00
rocky	e690ddd50a	Merge branch 'master' into python-2.4	2016-12-18 07:43:15 -05:00
rocky	45b7c1948c	show-asm on python2.5 is optional Make scanner2 a little more like scanner3.	2016-12-17 07:57:31 -05:00
rocky	e2fb7ca3d2	Python 2.6/2.7 tolerance in Python 2.4 branch	2016-12-17 06:51:47 -05:00
rocky	b3bda76582	Merge branch 'master' into python-2.4	2016-12-16 22:56:07 -05:00
rocky	ab6d322eca	Get ready for release 2.9.7	2016-12-04 14:09:53 -05:00
rocky	1a8a0df107	Merge branch 'master' into python-2.4	2016-12-04 13:40:06 -05:00
rocky	0a37709b0a	CircleCI build	2016-11-24 05:41:31 -05:00
rocky	98cd1417df	Remove dup Python 3 grammar rule	2016-11-24 05:36:43 -05:00
rocky	460069ceaa	Bug in 2.4 "if" dectection and... Wrong language used in old-style exceptions: use "except Error,e" not "except Error(e)""	2016-11-24 05:15:35 -05:00
rocky	316aa44f23	Python 2.6 grammary bug and.. __pkginfo.py__: Bump spark_parser version for parse_flags 'dups'	2016-11-24 04:09:32 -05:00
rocky	7133540c23	Make work on 2.4	2016-11-23 08:26:12 -05:00
rocky	590231741d	Merge branch 'come-from-type' into python-2.4	2016-11-23 07:54:18 -05:00
rocky	a9349b8f3d	Making it run on Python 2.4 and 2.5	2016-11-23 07:53:51 -05:00