Annotation field can be unicode...

When deparsing Python 3.x from Python 2.

.gitignore

@@ -17,5 +17,4 @@
 __pycache__
 build
 /.venv*
-/.idea
-/.hypothesis
+/.idea

.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 .

HISTORY.md

@@ -98,20 +98,9 @@ so. Then hamled made a few commits earler on, while Eike Siewertsen
 made a few commits later on. But mostly wibiti, and Guenther
 Starnberger got the code to where uncompyle2 was around 2012.
 
-While John Aycock and Hartmut Goebel were well versed in compiler
-technology, those that have come afterwards don't seem to have been as
-facile in it.  Furthermore, documentation or guidance on how the
-decompiler code worked, comparison to a conventional compiler
-pipeline, how to add new constructs, or debug grammars was weak. Some
-of the grammar tracing and error reporting was a bit weak as well.
-
-Given this, perhaps it is not surprising that subsequent changes
-tended to shy away from using the built-in compiler technology
-mechanisms and addressed problems and extensions by some other means.
-
-Specifically, in `uncompyle`, decompilation of python bytecode 2.5 & 2.6
-is done by transforming the byte code into a pseudo-2.7 Python
-bytecode and is based on code from Eloi Vanderbeken.
+In `uncompyle`, decompilation of python bytecode 2.5 & 2.6 is done by
+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
 reasons. However the main reason is that we need offsets in fragment

HOW-TO-REPORT-A-BUG.md

@@ -2,98 +2,17 @@
 
 ## The difficulty of the problem
 
-This decompiler is a constant work in progress: Python keeps
-changing, and so does its code generation.
+There is no Python decompiler yet, that I know about that will
+decompyle everything. This one probably does the
+best job of *any* Python decompiler. But it is a constant work in progress: Python keeps changing, and so does its code generation.
 
-There is no Python decompiler yet that I know about that will
-decompile everything. Overall, I think this one probably does the best
-job of *any* Python decompiler that handles such a wide range of
-versions.
+I have found bugs in *every* Python decompiler I have tried. Even
+those where authors/maintainers claim that they have used it on
+the entire Python standard library. And I don't mean that
+the program doesn't come out with the same Python source instructions,
+but that the program is *semantically* not equivalent.
 
-But at any given time, there are maybe dozens of valid Python bytecode
-files that I know of that will cause problems. And when I get through
-those and all the issues of decompiler bugs that are currently logged,
-I could probably easily find dozens more bugs just by doing a
-decompile of all the Python bytecode on any one of my
-computers. Unless you want to help out by _fixing_ bugs, or are
-willing to do work by isolating and narrowing bugs, don't feel you are
-doing me a favor by doing scans on your favorite sets of bytecode
-files.
-
-In sum, it is not uncommon that you will find a mistranslation in
-decompiling. Furthermore, you may be expected to do some work in order
-to have your bug worthy of being considered above other bugs.
-
-No one is getting paid to work to work on this project, let alone bugs
-you may have an interest in. If you require decompiling bytecode
-immediately, consider using a decompilation service.
-
-## Is it really a bug?
-
-
-### Do you have valid bytecode?
-
-As mentioned in README.rst, this project doesn't handle obfuscated
-code. See README.rst for suggestions for how to remove some kinds of
-obfuscation.
-
-Checking if bytecode is valid is pretty simple: disassemble the code.
-Python comes with a disassembly module called `dis`. A prerequisite
-module for this package, `xdis` has a cross-python version
-disassembler.
-
-### Semantic equivalence vs. exact source code
-
-Almost all versions of Python can perform some sort of code
-improvement that can't be undone. In earlier versions of Python it is
-rare; in later Python versions, it is more common.
-
-If the code emitted is semantically equivalent, then this isn't a bug.
-
-
-For example the code might be
-
-```
-if a:
-  if b:
-     x = 1
-```
-
-and we might produce:
-
-```
-if a and b:
-  x = 1
-```
-
-These are equivalent. Sometimes
-
-```
-else:
-   if ...
-
-```
-
-may come out as `elif`.
-
-
-As mentioned in the README, It is possible that Python changes what
-you write to be more efficient. For example, for:
-
-
-```
-if True:
-  x = 5
-```
-
-Python will generate code like:
-
-```
-x = 5
-```
-
-So just because the text isn't the same, does not
-necessarily mean there's a bug.
+So it is likely you'll find a mistranslation in decompiling.
 
 ## What to send (minimum requirements)
 
@@ -102,20 +21,13 @@ The basic requirement is pretty simple:
 * Python bytecode
 * Python source text
 
-Please don't put files on download services that one has to register
-for or can't get to by issuing a simple `curl` or `wget`. If you can't
-attach it to the issue, or create a github gist, then the code you are
-sending is too large.
-
-Also try to narrow the bug. See below.
-
 ## What to send (additional helpful information)
 
 Some kind folks also give the invocation they used and the output
-which usually includes an error message produced. This is
-helpful. From this, I can figure out what OS you are running this on
-and what version of *uncomplye6* was used. Therefore, if you don't
-provide the input command and the output from that, please give:
+which usually includes an error message produced. This is helpful. I
+can figure out what OS you are running this on and what version of
+*uncomplye6* was used. Therefore, if you don't provide the input
+command and the output from that, please give:
 
 * _uncompyle6_ version used
 * OS that you used this on
@@ -136,18 +48,11 @@ Well, you could learn. No one is born into this world knowing how to
 disassemble Python bytecode. And as Richard Feynman once said, "What
 one fool can learn, so can another."
 
-If this is too difficult, or too time consuming, or not of interest to
-you, then perhaps what require is a decompilation service. [Crazy
-Compilers](http://www.crazy-compilers.com/decompyle/) offers a
-byte-code decompiler service for versions of Python up to 2.6. (If
-there are others around let me know and I'll list them here.)
-
 ## Narrowing the problem
 
-I don't need or want the entire source code base for the file(s) or
-module(s) can't be decompiled. I just need those file(s) or module(s).
-If there are problems in several files, file a bug report for each
-file.
+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.
 
 Python modules can get quite large, and usually decompilation problems
 occur in a single function or maybe the main-line code but not any of
@@ -161,27 +66,3 @@ properly on a neighboring version of Python. That is helpful too.
 
 In sum, the more you can isolate or narrow the problem, the more
 likley the problem will be fixed and fixed sooner.
-
-## Confidentiality of Bug Reports
-
-When you report a bug, you are giving up confidentiality to the source
-code and the byte code. However, I would imagine that if you have
-narrowed the problem sufficiently, confidentiality of the little that
-remains would not be an issue.
-
-However feel free to remove any commments, and modify variable names
-or constants in the source code.
-
-## Ethics
-
-I do not condone using this program for unethical or illegal purposes.
-More detestful, at least to me, is asking for help to assist you in
-something that might not legitimate.
-
-Don't use the issue tracker for such solicitations. To try to stave
-off illegitimate behavior, you should note that the issue tracker, the
-code, and bugs mentioned in that are in the open: there is no
-confidentiality. You may be asked about the authorship or claimed
-ownership of the bytecode. If I think something is not quite right, I
-may label the issue questionable which may make the it easier those
-who are looking for illegal activity.

Makefile

@@ -11,7 +11,7 @@ RM      ?= rm
 LINT    = flake8
 
 #EXTRA_DIST=ipython/ipy_trepan.py trepan
-PHONY=all check clean distcheck pytest check-long dist distclean lint flake8 test rmChangeLog clean_pyc
+PHONY=all check clean pytest check-long dist distclean lint flake8 test rmChangeLog clean_pyc
 
 TEST_TYPES=check-long check-short check-2.7 check-3.4
 
@@ -39,12 +39,12 @@ check-3.0 check-3.1 check-3.2 check-3.5 check-3.6:
 check-3.7: pytest
 
 #: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 PyPy 5.0.1, or PyPy 5.8.0-beta0
+#:PyPy 2.6.1 or PyPy 5.0.1
 # Skip for now
-2.6 5.0 5.3 5.6 5.8:
+2.6 5.0 5.3:
 
 #:PyPy pypy3-2.4.0 Python 3:
 pypy-3.2 2.4:
@@ -60,12 +60,8 @@ clean: clean_pyc
 	(cd test && $(MAKE) clean)
 
 #: Create source (tarball) and wheel distribution
-dist: distcheck
-	$(PYTHON) ./setup.py sdist bdist_wheel
-
-# perform some checks on the package via setup.py
-distcheck:
-	$(PYTHON) ./setup.py check
+dist:
+	$(PYTHON) ./setup.py sdist bdist_egg
 
 #: Remove .pyc files
 clean_pyc:
@@ -93,7 +89,7 @@ bdist_egg:
 
 
 #: Create binary wheel distribution
-wheel:
+bdist_wheel:
 	$(PYTHON) ./setup.py bdist_wheel
 
 

NEWS

@@ -1,59 +1,9 @@
-uncompyle6 2.14.0 2017-11-26 johnnybamazing
-
-- Start to isolate grammar rules between versions
-  and remove used grammar rules
-- Fix a number of bytecode decompile problems
-  (many more remain)
-- Add stdlib/runtests.sh for even more rigourous testing
-
-uncompyle6 2.13.3 2017-11-13
-
-Overall: better 3.6 decompiling and some much needed code refactoring and cleanup
-
-
-- Start noting names in for template-action names; these are
-  used to check/assert we have the right node type
-- Simplify <import_from> rule
-- Pypy 5.80-beta testing tolerance
-- Start to clean up instruction mangling phase by using 3.6-style instructions
-  rather trying to parse the bytecode array. This largely been done in for versions 3.x;
-  3.0 custom mangling code has been reduced;
-  some 2.x conversion has been done, but more is desired. This make it possible to...
-- Handle EXTENDED_ARGS better. While relevant to all Python versions it is most noticeable in
-  version 3.6+ where in switching to wordcodes the size of operands has been reduced from 2**16
-  to 2**8. JUMP instruction then often need EXTENDED_ARGS.
-- Refactor find_jump_targets() with via working of of instructions rather the bytecode array.
-- use --weak-verify more and additional fuzzing on verify()
-- fragment parser now ignores errors in nested function definitions; an parameter was
-  added to assist here. Ignoring errors may be okay because the fragment parser often just needs,
-  well, *fragments*.
-- Distinguish RETURN_VALUE from RETURN_END_IF in exception bodies better in 3.6
-- bug in 3.x language changes: import queue va import Queue
-- reinstate some bytecode tests since decompiling has gotten better
-- Revise how to report a bug
-
-uncompyle6 2.13.2 2017-10-12
-
-- Re-release using a more automated approach
-
-uncompyle6 2.13.1 2017-10-11
-
-- Re-release because Python 2.4 source uploaded rather than 2.6-3.6
-
-uncompyle6 2.13.0 2017-10-10
-
-- Fixes in deparsing lambda expressions
-- Improve table-semantics descriptions
-- Document hacky customize arg count better (until we can remove it)
-- Update to use xdis 3.7.0 or greater
-
-uncompyle6 2.12.0 2017-09-26
+uncompyle6 2.12.0 2017-09-25
 
 - Use xdis 3.6.0 or greater now
 - Small semantic table cleanups
 - Python 3.4's terms a little names better
 - Slightly more Python 3.7, but still failing a lot
-- Cross Python 2/3 compatibility with annotation arguments
 
 uncompyle6 2.11.5 2017-08-31
 

README.rst

@@ -4,7 +4,7 @@ uncompyle6
 ==========
 
 A native Python cross-version Decompiler and Fragment Decompiler.
-The successor to decompyle, uncompyle, and uncompyle2.
+Follows in the tradition of decompyle, uncompyle, and uncompyle2.
 
 
 Introduction
@@ -17,23 +17,17 @@ source code. It accepts bytecodes from Python version 1.5, and 2.1 to
 Why this?
 ---------
 
-There were a number of decompyle, uncompyle, uncompyle2, uncompyle3
+There were a number of decompyle, uncompile, uncompyle2, uncompyle3
 forks around. All of them came basically from the same code base, and
 almost all of them no were no longer actively maintained. Only one
 handled Python 3, and even there, only 3.2 or 3.3 depending on which
-code is used. This code pulls these together and moves forward.
+code is used. This code pulls these together and moves forward. This
+project has the most complete support for Python 3.3 and above. It
+also addresses a number of open issues in the previous forks.
 
-This project has the most complete support for Python 3.3 and above
-and the best all-around Python support.
-
-We are serious about testing, and use automated processes to find
-bugs. In the issue trackers for other decompilers, you will find a
-number of bugs we've found along the way. Very few to none of them are
-not fixed in the other decompilers.
-
-Another thing that makes this different from other CPython bytecode
-decompilers is the ability to deparse just fragments and give
-source-code information around a given bytecode offset.
+What makes this different from other CPython bytecode decompilers?: its
+ability to deparse just fragments and give source-code information
+around a given bytecode offset.
 
 I use this to deparse fragments of code inside my trepan_
 debuggers_. For that, I need to record text fragments for all
@@ -115,14 +109,14 @@ Known Bugs/Restrictions
 -----------------------
 
 The biggest known and possibly fixable (but hard) problem has to do
-with handling control flow. (Python has probably the most diverse and
-screwy set of compound statements I've ever seen; a number of the
-usual ones like else clauses on loops and try blocks I suspect most
-programmers don't know aobut.)
+with handling control flow. All of the Python decompilers I have looked
+at have the same problem. In some cases we can detect an erroneous
+decompilation and report that.
 
-All of the Python decompilers I have looked at have the same
-problem. In some cases we can detect an erroneous decompilation and
-report that.
+Over 98% of the decompilation of Python standard library packages in
+Python 2.7.12 verifies correctly. Over 99% of Python 2.7 and 3.3-3.5
+"weakly" verify. Python 2.6 drops down to 96% weakly verifying.
+Other versions drop off in quality too.
 
 *Verification* is the process of decompiling bytecode, compiling with
 a Python for that bytecode version, and then comparing the bytecode
@@ -140,17 +134,6 @@ program by running the Python interpreter. Because the Python language
 has changed so much, for best results you should use the same Python
 Version in checking as used in the bytecode.
 
-Finally, we have automated running the standard Python tests after
-first compiling and decompiling the test program. Results here are a
-bit weak (if not better than most other Python decompilers). But over
-time this will probably get better.
-
-Python support is strongest in Python 2 for 2.7 and drops off as you
-get further away from that. Support is also probably pretty good for
-python 2.3-2.4 since a lot of the goodness of early the version of the
-decompiler from that era has been preserved (and Python compilation in
-that era was minimal)
-
 Later distributions average about 200 files. There is some work to do
 on the lower end Python versions which is more difficult for us to
 handle since we don't have a Python interpreter for versions 1.5, 1.6,
@@ -161,9 +144,7 @@ In the Python 3 series, Python support is is strongest around 3.4 or
 3.6 changes things drastically by using word codes rather than byte
 codes. That has been addressed, but then it also changes function call
 opcodes and its semantics and has more problems with control flow than
-3.5 has. Between Python 3.5, 3.6 and 3.7 there have been major changes
-to the `MAKE_FUNCTION` and `CALL_FUNCTION` instructions. Those are
-not handled yet.
+3.5 has.
 
 Currently not all Python magic numbers are supported. Specifically in
 some versions of Python, notably Python 3.6, the magic number has
@@ -188,7 +169,7 @@ See Also
 
 * https://github.com/zrax/pycdc : supports all versions of Python and is written in C++. Support for later Python 3 versions is a bit lacking though.
 * 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. Includes some fixes like supporting function annotations
+* 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/HOW-TO-REPORT-A-BUG.md>`_
 * https://github.com/rocky/python-xdis : Cross Python version disassembler

__pkginfo__.py

@@ -39,8 +39,8 @@ entry_points       = {
         'pydisassemble=uncompyle6.bin.pydisassemble:main',
     ]}
 ftp_url            = None
-install_requires   = ['spark-parser >= 1.8.0, < 1.9.0',
-                      'xdis >= 3.6.1, < 3.7.0', 'six']
+install_requires   = ['spark-parser >= 1.6.1, < 1.7.0',
+                      'xdis >= 3.6.0, < 3.7.0']
 license            = 'MIT'
 mailing_list       = 'python-debugger@googlegroups.com'
 modname            = 'uncompyle6'

admin-tools/README.md

@@ -1,11 +0,0 @@
-Making a release is a somewhat tedious process so I've automated it a little
-
-
-Here are tools that I, rocky, use to check and build a distribution.
-
-They are customized to my environment:
-- I use pyenv to various Python versions installed
-- I have git repos for xdis, and spark parser at the same level as uncompyle6
-
-There may be other rocky-specific things that need customization.
-how-to-make-a-release.txt has overall how I make a release

admin-tools/check-newer-versions.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-function finish {
-  cd $owd
-}
-
-# FIXME put some of the below in a common routine
-owd=$(pwd)
-trap finish EXIT
-
-cd $(dirname ${BASH_SOURCE[0]})
-if ! source ./pyenv-newer-versions ; then
-    exit $?
-fi
-if ! source ./setup-master.sh ; then
-    exit $?
-fi
-cd ..
-for version in $PYVERSIONS; do
-    if ! pyenv local $version ; then
-	exit $?
-    fi
-    make clean && pip install -e .
-    if ! make check; then
-	exit $?
-    fi
-done

admin-tools/check-older-versions.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-function finish {
-  cd $owd
-}
-owd=$(pwd)
-trap finish EXIT
-
-cd $(dirname ${BASH_SOURCE[0]})
-if ! source ./pyenv-older-versions ; then
-    exit $?
-fi
-if ! source ./setup-python-2.4.sh ; then
-    exit $?
-fi
-
-PYVERSIONS='2.7.14 2.6.9 3.3.6 3.4.2 3.5.4 3.6.3'
-
-cd ..
-for version in $PYVERSIONS; do
-    if ! pyenv local $version ; then
-	exit $?
-    fi
-    make clean && python setup.py develop
-    if ! make check ; then
-	exit $?
-    fi
-done

admin-tools/how-to-make-a-release.md

@@ -1,88 +0,0 @@
-<!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc-refresh-toc -->
-**Table of Contents**
-
-- [Get latest sources:](#get-latest-sources)
-- [Change version in uncompyle6/version.py. Then:](#change-version-in-uncompyle6versionpy-then)
-- [Update ChangeLog:](#update-changelog)
-- [Update NEWS from ChangeLog. Then:](#update-news-from-changelog-then)
-- [Make sure pyenv is running and check newer versions](#make-sure-pyenv-is-running-and-check-newer-versions)
-- [Switch to python-2.4, sync that up and build that first since it creates a tarball which we don't want.](#switch-to-python-24-sync-that-up-and-build-that-first-since-it-creates-a-tarball-which-we-dont-want)
-- [Update NEWS from master branch](#update-news-from-master-branch)
-- [Check against all versions](#check-against-all-versions)
-- [Make packages and tag](#make-packages-and-tag)
-- [Upload single package and look at Rst Formating](#upload-single-package-and-look-at-rst-formating)
-- [Upload rest of versions](#upload-rest-of-versions)
-- [Push tags:](#push-tags)
-
-<!-- markdown-toc end -->
-# Get latest sources:
-
-    $ . ./admin-tool/update-sources.sh
-
-# Change version in uncompyle6/version.py. Then:
-
-	$ emacs uncompyle6/version.py
-    $ source uncompyle6/version.py
-    $ echo $VERSION
-    $ git commit -m"Get ready for release $VERSION" .
-
-# Update ChangeLog:
-
-    $ make ChangeLog
-
-#  Update NEWS from ChangeLog. Then:
-
-	$ emacs NEWS
-    $ make check
-    $ git commit --amend .
-    $ git push   # get CI testing going early
-
-# Make sure pyenv is running and check newer versions
-
-    $ pyenv local && source admin-tools/check-newer-versions.sh
-
-# Switch to python-2.4, sync that up and build that first since it creates a tarball which we don't want.
-
-    $ source admin-tools/setup-python-2.4.sh
-    $ rm ChangeLog
-
-    # $ git merge master ?
-
-# Update NEWS from master branch
-
-    $ git commit -m"Get ready for release $VERSION" .
-
-# Check against all versions
-
-    $ source admin-tools/check-older-versions.sh
-    $ source admin-tools/check-newer-versions.sh
-
-# Make packages and tag
-
-    $ admin-tools/make-dist-older.sh
-    $ git tag release-python-2.4-$VERSION
-
-    $ admin-tools/make-dist-newer.sh
-    $ git tag release-$VERSION
-
-# Upload single package and look at Rst Formating
-
-    $ twine upload dist/uncompyle6-${VERSION}-py3.3.egg
-
-# Upload rest of versions
-
-    $ twine upload dist/uncompyle6-${VERSION}*
-
-# Push tags:
-
-    $ git push --tags
-
-# Check on a VM
-
-    $ cd /virtual/vagrant/virtual/vagrant/ubuntu-zesty
-	$ vagrant up
-	$ vagrant ssh
-	$ pyenv local 3.5.2
-	$ pip install --upgrade uncompyle6
-	$ exit
-	$ vagrant halt

admin-tools/make-dist-newer.sh

@@ -1,38 +0,0 @@
-#!/bin/bash
-PACKAGE=uncompyle6
-
-# FIXME put some of the below in a common routine
-function finish {
-  cd $owd
-}
-
-cd $(dirname ${BASH_SOURCE[0]})
-owd=$(pwd)
-trap finish EXIT
-
-if ! source ./pyenv-newer-versions ; then
-    exit $?
-fi
-if ! source ./setup-master.sh ; then
-    exit $?
-fi
-
-cd ..
-source $PACKAGE/version.py
-echo $VERSION
-
-for pyversion in $PYVERSIONS; do
-    if ! pyenv local $pyversion ; then
-	exit $?
-    fi
-    # pip bdist_egg create too-general wheels. So
-    # we narrow that by moving the generated wheel.
-
-    # Pick out first two number of version, e.g. 3.5.1 -> 35
-    first_two=$(echo $pyversion | cut -d'.' -f 1-2 | sed -e 's/\.//')
-    rm -fr build
-    python setup.py bdist_egg bdist_wheel
-    mv -v dist/${PACKAGE}-$VERSION-{py2.py3,py$first_two}-none-any.whl
-done
-
-python ./setup.py sdist

admin-tools/make-dist-older.sh

@@ -1,39 +0,0 @@
-#!/bin/bash
-PACKAGE=uncompyle6
-
-# FIXME put some of the below in a common routine
-function finish {
-  cd $owd
-}
-owd=$(pwd)
-trap finish EXIT
-
-cd $(dirname ${BASH_SOURCE[0]})
-if ! source ./pyenv-older-versions ; then
-    exit $?
-fi
-if ! source ./setup-python-2.4.sh ; then
-    exit $?
-fi
-
-cd ..
-source $PACKAGE/version.py
-echo $VERSION
-
-for pyversion in $PYVERSIONS; do
-    if ! pyenv local $pyversion ; then
-	exit $?
-    fi
-
-    rm -fr build
-    python setup.py bdist_egg
-done
-
-# Pypi can only have one source tarball.
-# Tarballs can get created from the above setup, so make sure to remove them since we want
-# the tarball from master.
-
-tarball=dist/${PACKAGE}-$VERSION-tar.gz
-if [[ -f $tarball ]]; then
-    rm -v dist/${PACKAGE}-$VERSION-tar.gz
-fi

admin-tools/pyenv-newer-versions

@@ -1,6 +0,0 @@
-# -*- shell-script -*-
-if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
-    echo "This script should be *sourced* rather than run directly through bash"
-    exit 1
-fi
-export PYVERSIONS='3.5.2 3.6.2 2.6.9 3.3.6 2.7.14 3.4.2'

admin-tools/pyenv-older-versions

@@ -1,6 +0,0 @@
-# -*- shell-script -*-
-if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
-    echo "This script should be *sourced* rather than run directly through bash"
-    exit 1
-fi
-export PYVERSIONS='2.4.6 2.5.6'

admin-tools/setup-master.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-PYTHON_VERSION=3.6.3
-
-# FIXME put some of the below in a common routine
-function finish {
-  cd $owd
-}
-
-export PATH=$HOME/.pyenv/bin/pyenv:$PATH
-owd=$(pwd)
-bs=${BASH_SOURCE[0]}
-if [[ $0 == $bs ]] ; then
-    echo "This script should be *sourced* rather than run directly through bash"
-    exit 1
-fi
-mydir=$(dirname $bs)
-fulldir=$(readlink -f $mydir)
-cd $fulldir/..
-(cd ../python-spark && git checkout master && pyenv local $PYTHON_VERSION) && git pull && \
-    (cd ../python-xdis && git checkout master && pyenv local $PYTHON_VERSION) && git pull && \
-    git checkout master && pyenv local $PYTHON_VERSION && git pull
-cd $owd

admin-tools/setup-python-2.4.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-PYTHON_VERSION=2.4.6
-
-owd=$(pwd)
-bs=${BASH_SOURCE[0]}
-if [[ $0 == $bs ]] ; then
-    echo "This script should be *sourced* rather than run directly through bash"
-    exit 1
-fi
-mydir=$(dirname $bs)
-fulldir=$(readlink -f $mydir)
-cd $fulldir/..
-(cd ../python-spark && git checkout python-2.4 && pyenv local $PYTHON_VERSION) && git pull && \
-    (cd ../python-xdis && git checkout python-2.4 && pyenv local $PYTHON_VERSION) && git pull && \
-    git checkout python-2.4 &&  pyenv local $PYTHON_VERSION && git pull
-cd $owd

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

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):

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()

pytest/test_fjt.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 from uncompyle6 import PYTHON_VERSION, IS_PYPY
 from uncompyle6.scanner import get_scanner
-from xdis.bytecode import Bytecode
 from array import array
 def bug(state, slotstate):
     if state:
@@ -22,25 +21,19 @@ 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)
         scan.build_prev_op(n)
         fjt = scan.find_jump_targets(False)
-
-        ## FIXME: the data below is wrong.
-        ## we get different results currenty as well.
-        ## We need to probably fix both the code
-        ## and the test below
-        # assert {15: [3], 69: [66], 63: [18]} == fjt
-        # assert scan.structs == \
-        #   [{'start': 0, 'end': 72, 'type': 'root'},
-        #    {'start': 15, 'end': 66, 'type': 'if-then'},
-        #    {'start': 31, 'end': 59, 'type': 'for-loop'},
-        #    {'start': 62, 'end': 63, 'type': 'for-else'}]
+        assert {15: [3], 69: [66], 63: [18]} == fjt
+        assert scan.structs == \
+          [{'start': 0, 'end': 72, 'type': 'root'},
+           {'start': 15, 'end': 66, 'type': 'if-then'},
+           {'start': 31, 'end': 59, 'type': 'for-loop'},
+           {'start': 62, 'end': 63, 'type': 'for-else'}]
 
         code = bug_loop.__code__
         n = scan.setup_code(code)
@@ -59,11 +52,9 @@ def test_if_in_for():
             {'start': 48, 'end': 67, 'type': 'while-loop'}]
 
     elif 3.2 < PYTHON_VERSION <= 3.4:
-        bytecode = Bytecode(code, scan.opc)
         scan.code = array('B', code.co_code)
         scan.build_lines_data(code)
         scan.build_prev_op()
-        scan.insts = list(bytecode)
         fjt  = scan.find_jump_targets(False)
         assert {69: [66], 63: [18]} == fjt
         assert scan.structs == \

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)

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)

pytest/test_grammar.py

@@ -11,18 +11,15 @@ def test_grammar():
         remain_tokens = set([re.sub('_CONT$','', t) for t in remain_tokens])
         remain_tokens = set(remain_tokens) - opcode_set
         assert remain_tokens == set([]), \
-            "Remaining tokens %s\n====\n%s" % (remain_tokens, p.dump_grammar())
+            "Remaining tokens %s\n====\n%s" % (remain_tokens, p.dumpGrammar())
 
     p = get_python_parser(PYTHON_VERSION, is_pypy=IS_PYPY)
-    (lhs, rhs, tokens,
-     right_recursive, dup_rhs) = p.check_sets()
+    lhs, rhs, tokens, right_recursive = p.checkSets()
     expect_lhs = set(['expr1024', 'pos_arg'])
     unused_rhs = set(['build_list', 'call_function', 'mkfunc',
                       'mklambda',
-                      'unpack',])
-
-    expect_right_recursive = frozenset([('designList',
-                                         ('designator', 'DUP_TOP', 'designList'))])
+                      'unpack', 'unpack_list'])
+    expect_right_recursive = [['designList', ('designator', 'DUP_TOP', 'designList')]]
     if PYTHON3:
         expect_lhs.add('load_genexpr')
 
@@ -36,36 +33,19 @@ def test_grammar():
             pass
     else:
         expect_lhs.add('kwarg')
-
-    # FIXME: grammar remove_rule on
-    #  kv3 ::= expr expr STORE_MAP
-    # doesn't currently work in grammar, so we have this extraneous kv3 around.
-    if 3.3 <= PYTHON_VERSION <= 3.4:
-        expect_lhs.add('kv3')
-
     assert expect_lhs == set(lhs)
     assert unused_rhs == set(rhs)
     assert expect_right_recursive == right_recursive
-
-    expect_dup_rhs = frozenset([('COME_FROM',), ('CONTINUE',), ('JUMP_ABSOLUTE',),
-                                ('LOAD_CONST',),
-                                ('JUMP_BACK',), ('JUMP_FORWARD',)])
-    reduced_dup_rhs = {k: dup_rhs[k] for k in dup_rhs if k not in expect_dup_rhs}
-    for k in reduced_dup_rhs:
-        print(k, reduced_dup_rhs[k])
-    # assert not reduced_dup_rhs, reduced_dup_rhs
-
     s = get_scanner(PYTHON_VERSION, IS_PYPY)
     ignore_set = set(
             """
-            JUMP_BACK CONTINUE
+            JUMP_BACK CONTINUE RETURN_END_IF
             COME_FROM COME_FROM_EXCEPT
             COME_FROM_EXCEPT_CLAUSE
             COME_FROM_LOOP COME_FROM_WITH
             COME_FROM_FINALLY ELSE
             LOAD_GENEXPR LOAD_ASSERT LOAD_SETCOMP LOAD_DICTCOMP
-            LAMBDA_MARKER
-            RETURN_END_IF RETURN_END_IF_LAMBDA RETURN_VALUE_LAMBDA RETURN_LAST
+            LAMBDA_MARKER RETURN_LAST
             """.split())
     if 2.6 <= PYTHON_VERSION <= 2.7:
         opcode_set = set(s.opc.opname).union(ignore_set)

pytest/test_pysource.py

@@ -6,12 +6,8 @@ from uncompyle6.semantics.consts import (
 
 if PYTHON3:
     from io import StringIO
-    def iteritems(d):
-        return d.items()
 else:
     from StringIO import StringIO
-    def iteritems(d):
-        return d.iteritems()
 
 from uncompyle6.semantics.pysource import SourceWalker as SourceWalker
 
@@ -25,23 +21,19 @@ def test_template_engine():
     # FIXME: and so on...
 
 from uncompyle6.semantics.consts import (
-    TABLE_DIRECT, TABLE_R,
+    TABLE_R, TABLE_DIRECT,
     )
 
 from uncompyle6.semantics.fragments import (
     TABLE_DIRECT_FRAGMENT,
     )
 
-skip_for_now = "DELETE_DEREF".split()
-
 def test_tables():
     for t, name, fragment in (
             (TABLE_DIRECT, 'TABLE_DIRECT', False),
             (TABLE_R, 'TABLE_R', False),
             (TABLE_DIRECT_FRAGMENT, 'TABLE_DIRECT_FRAGMENT', True)):
-        for k, entry in iteritems(t):
-            if k in skip_for_now:
-                continue
+        for k, entry in t.iteritems():
             fmt = entry[0]
             arg = 1
             i = 0
@@ -56,18 +48,10 @@ def test_tables():
                 elif typ in frozenset(['c', 'p', 'P', 'C', 'D']):
                     # One arg - should be int or tuple of int
                     if typ == 'c':
-                        item = entry[arg]
-                        if isinstance(item, tuple):
-                            assert isinstance(item[1], str), (
-                            "%s[%s][%d] kind %s is '%s' should be str but is %s. "
+                        assert isinstance(entry[arg], int), (
+                            "%s[%s][%d] type %s is '%s' should be an int but is %s. "
                             "Full entry: %s" %
-                            (name, k, arg, typ, item[1], type(item[1]), entry)
-                            )
-                            item = item[0]
-                        assert isinstance(item, int), (
-                            "%s[%s][%d] kind %s is '%s' should be an int but is %s. "
-                            "Full entry: %s" %
-                            (name, k, arg, typ, item, type(item), entry)
+                            (name, k, arg, typ, entry[arg], type(entry[arg]), entry)
                             )
                     elif typ in frozenset(['C', 'D']):
                         tup = entry[arg]

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'

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,8 +126,9 @@ def validate_uncompyle(text, mode='exec'):
     original_text = text
 
     deparsed = deparse_code(PYTHON_VERSION, original_code,
+
                             compile_mode=mode,
-                            out=six.StringIO(),
+                            out=StringIO(),
                             is_pypy=IS_PYPY)
     uncompyled_text = deparsed.text
     uncompyled_code = compile(uncompyled_text, '<string>', 'exec')

setup.py

@@ -24,6 +24,6 @@ setup(
        py_modules         = py_modules,
        test_suite         = 'nose.collector',
        url                = web,
-       tests_require      = ['nose>=1.0'],
+       tests_require     = ['nose>=1.0'],
        version            = VERSION,
        zip_safe           = zip_safe)

test/Makefile

@@ -8,7 +8,6 @@ NATIVE_CHECK = check-$(PYTHON_VERSION)
 
 # Set COMPILE='--compile' to force compilation before check
 COMPILE ?=
-COVER_DIR=../tmp/grammar-cover
 
 # Run short tests
 check-short:
@@ -20,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
@@ -40,7 +39,7 @@ check-3.3: check-bytecode
 
 #: Run working tests from Python 3.4
 check-3.4: check-bytecode check-3.4-ok check-2.7-ok
-	$(PYTHON) test_pythonlib.py --bytecode-3.4 --weak-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --bytecode-3.4 --verify $(COMPILE)
 
 #: Run working tests from Python 3.5
 check-3.5: check-bytecode
@@ -48,11 +47,7 @@ check-3.5: check-bytecode
 
 #: Run working tests from Python 3.6
 check-3.6: check-bytecode
-	$(PYTHON) test_pythonlib.py --bytecode-3.6 --weak-verify $(COMPILE)
-
-# FIXME
-#: this is called when running under pypy3.5-5.8.0 or pypy2-5.6.0
-5.8 5.6:
+	$(PYTHON) test_pythonlib.py --bytecode-3.6 --verify $(COMPILE)
 
 #: Check deparsing only, but from a different Python version
 check-disasm:
@@ -102,56 +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:
-	-rm $(COVER_DIR)/spark-grammar-25.cover
-	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-25.cover $(PYTHON) test_pythonlib.py --bytecode-2.5
-	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-25.cover $(PYTHON) test_pyenvlib.py --2.5.6
-
-#: Get grammar coverage for Python 2.6
-grammar-coverage-2.6:
-	-rm $(COVER_DIR)/spark-grammar-26.cover
-	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-26.cover $(PYTHON) test_pythonlib.py --bytecode-2.6
-	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-26.cover $(PYTHON) test_pyenvlib.py --2.6.9
-
-#: Get grammar coverage for Python 2.7
-grammar-coverage-2.7:
-	-rm $(COVER_DIR)/spark-grammar-27.cover
-	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-27.cover $(PYTHON) test_pythonlib.py --bytecode-2.7
-	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-27.cover $(PYTHON) test_pyenvlib.py --2.7.13
-
-#: Get grammar coverage for Python 3.2
-grammar-coverage-3.2:
-	-rm $(COVER_DIR)/spark-grammar-32.cover
-	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-32.cover $(PYTHON) test_pythonlib.py --bytecode-3.2
-	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-32.cover $(PYTHON) test_pyenvlib.py --3.2.6
-
-#: Get grammar coverage for Python 3.3
-grammar-coverage-3.3:
-	-rm $(COVER_DIR)/spark-grammar-33.cover
-	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-33.cover $(PYTHON) test_pythonlib.py --bytecode-3.3
-	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-33.cover $(PYTHON) test_pyenvlib.py --3.3.6
-
-##: Get grammar coverage for Python 3.4
-grammar-coverage-3.4:
-	-rm $(COVER_DIR)/spark-grammar-34.cover
-	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-34.cover $(PYTHON) test_pythonlib.py --bytecode-3.4
-	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-34.cover $(PYTHON) test_pyenvlib.py --3.4.2
-
-##: Get grammar coverage for Python 3.5
-grammar-coverage-3.5:
-	rm $(COVER_DIR)/spark-grammar-35.cover || /bin/true
-	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-35.cover $(PYTHON) test_pythonlib.py --bytecode-3.5
-	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-35.cover $(PYTHON) test_pyenvlib.py --3.5.2
-
-#: Check deparsing Python 2.6
-pcheck-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 --weak-verify
-
 #: Check deparsing Python 3.0
 check-bytecode-3.0:
 	$(PYTHON) test_pythonlib.py --bytecode-3.0
@@ -170,7 +115,7 @@ check-bytecode-3.3:
 
 #: Check deparsing Python 3.4
 check-bytecode-3.4:
-	$(PYTHON) test_pythonlib.py --bytecode-3.4 --weak-verify
+	$(PYTHON) test_pythonlib.py --bytecode-3.4
 
 #: Check deparsing Python 3.5
 check-bytecode-3.5:
@@ -180,13 +125,37 @@ 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) --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:
-	$(PYTHON) test_pythonlib.py --ok-2.6 --weak-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --ok-2.6 --verify $(COMPILE)
 
 #: Run longer Python 2.7's lib files known to be okay
 check-2.7-ok:

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

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
 

test/simple_source/branching/02_ifelse_lambda.py

@@ -1,16 +0,0 @@
-# We have to do contortions here because
-# lambda's have to be more or less on a line
-
-f = lambda x: 1 if x<2 else 3
-f(5)
-
-# If that wasn't enough ...
-# Python will create dead code
-# in the below. So we must make sure
-# not to include the else expression
-
-g = lambda: 1 if True else 3
-g()
-
-h = lambda: 1 if False else 3
-h()

test/simple_source/bug22/01_kv.py

@@ -1,3 +0,0 @@
-# Test of building map via kv rules
-aa = 'aa'
-dict0 = {'a': 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa','b': 1234,'d': aa,aa: aa}

test/simple_source/bug27+/05_for_try_except.py

@@ -16,17 +16,3 @@ for a in [__name__]:
     try:len(a)
     except:continue
     y = 2
-
-# From 2.7.14 decimal.py
-# Bug is in handling a CONTINUE op as a result of it being inside
-# an except in a loop
-def foo(self, error, ordered_errors, vals, funct, Signals):
-    for error in ordered_errors:
-        try:
-            funct(*vals)
-        except error:
-            pass
-        except Signals as e:
-            error = e
-        else:
-            error = 5

test/simple_source/bug30/01_ops.py

@@ -1,16 +0,0 @@
-# Statements to beef up grammar coverage rules
-# Force "inplace" ops
-y = +10  # UNARY_POSITIVE
-y /= 1   # INPLACE_DIVIDE
-y %= 4   # INPLACE_MODULO
-y **= 1  # INPLACE POWER
-y >>= 2  # INPLACE_RSHIFT
-y <<= 2  # INPLACE_LSHIFT
-y //= 1  # INPLACE_TRUE_DIVIDE
-y &= 1   # INPLACE_AND
-y ^= 1   # INPLACE_XOR
-
-# Beef up augassign and STORE_SLICE+3
-x = [1,2,3,4,5]
-x[0:1] = 1
-x[0:3] += 1, 2, 3

test/simple_source/bug32/03_if_try_raise.py

@@ -1,21 +0,0 @@
-# From 3.2 distutils/core
-# Ensure we handle funky trystmt
-def setup (ok, dist, **attrs):
-    if ok:
-        try:
-            dist.run_commands()
-        except KeyboardInterrupt:
-            raise SystemExit("interrupted")
-        except IOError as exc:
-            error = exc
-            if dist:
-                raise
-            else:
-                raise SystemExit(error)
-        except (RuntimeError) as msg:
-            if dist:
-                raise
-            else:
-                raise SystemExit("error: " + str(msg))
-
-    return dist