Merge branch 'master' into python-2.4

in a hacky way

.circleci/config.yml

@@ -1,87 +0,0 @@
-# This configuration was automatically generated from a CircleCI 1.0 config.
-# It should include any build commands you had along with commands that CircleCI
-# inferred from your project structure. We strongly recommend you read all the
-# comments in this file to understand the structure of CircleCI 2.0, as the idiom
-# for configuration has changed substantially in 2.0 to allow arbitrary jobs rather
-# than the prescribed lifecycle of 1.0. In general, we recommend using this generated
-# configuration as a reference rather than using it in production, though in most
-# cases it should duplicate the execution of your original 1.0 config.
-version: 2
-jobs:
-  build:
-    working_directory: ~/rocky/python-uncompyle6
-    parallelism: 1
-    shell: /bin/bash --login
-    # CircleCI 2.0 does not support environment variables that refer to each other the same way as 1.0 did.
-    # If any of these refer to each other, rewrite them so that they don't or see https://circleci.com/docs/2.0/env-vars/#interpolating-environment-variables-to-set-other-environment-variables .
-    environment:
-      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
-      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-      COMPILE: --compile
-    # In CircleCI 1.0 we used a pre-configured image with a large number of languages and other packages.
-    # In CircleCI 2.0 you can now specify your own image, or use one of our pre-configured images.
-    # The following configuration line tells CircleCI to use the specified docker image as the runtime environment for you job.
-    # We have selected a pre-built image that mirrors the build environment we use on
-    # the 1.0 platform, but we recommend you choose an image more tailored to the needs
-    # of each job. For more information on choosing an image (or alternatively using a
-    # VM instead of a container) see https://circleci.com/docs/2.0/executor-types/
-    # To see the list of pre-built images that CircleCI provides for most common languages see
-    # https://circleci.com/docs/2.0/circleci-images/
-    machine:
-      python:
-        version: 2.7.14
-    steps:
-    # Machine Setup
-    #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
-    # The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out.
-    - checkout
-    # Prepare for artifact and test results  collection equivalent to how it was done on 1.0.
-    # In many cases you can simplify this from what is generated here.
-    # 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/'
-    - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
-    # This is based on your 1.0 configuration file or project settings
-    - run:
-        working_directory: ~/rocky/python-uncompyle6
-        command: pip install virtualenv && pip install nose && pip install pep8 && pyenv rehash
-    # Dependencies
-    #   This would typically go in either a build or a build-and-test job when using workflows
-    # Restore the dependency cache
-    - restore_cache:
-        keys:
-          - v2-dependencies-{{ .Branch }}-
-          # fallback to using the latest cache if no exact match is found
-          - v2-dependencies-
-
-    # This is based on your 1.0 configuration file or project settings
-    - run: pip install --upgrade setuptools
-    - run: pip install -e .
-    - run: pip install -r requirements-dev.txt
-
-    # Save dependency cache
-    - save_cache:
-        key: v2-dependencies-{{ .Branch }}-{{ epoch }}
-        paths:
-        # This is a broad list of cache paths to include many possible development environments
-        # You can probably delete some of these entries
-        - vendor/bundle
-        - ~/virtualenvs
-        - ~/.m2
-        - ~/.ivy2
-        - ~/.bundle
-        - ~/.cache/bower
-
-    # Test
-    #   This would typically be a build job when using workflows, possibly combined with build
-    # This is based on your 1.0 configuration file or project settings
-    - run: python ./setup.py develop && make check-2.7
-    - run: cd ./test/stdlib && bash ./runtests.sh 'test_[p-z]*.py'
-    # Teardown
-    #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
-    # Save test results
-    - store_test_results:
-        path: /tmp/circleci-test-results
-    # Save artifacts
-    - store_artifacts:
-        path: /tmp/circleci-artifacts
-    - store_artifacts:
-        path: /tmp/circleci-test-results

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,77 +0,0 @@
----
-name: Bug report
-about: Tell us about uncompyle6 bugs
-
----
-
-<!-- __Note:__ Have you read https://github.com/rocky/python-uncompyle6/blob/master/HOW-TO-REPORT-A-BUG.md ?
-
-Please remove any of the optional sections if they are not applicable.
-
-Prerequisites
-
-* Make sure the bytecode you have can be disassembled with a
-  disassembler.
-* Don't put bytecode and corresponding source code on any service that
-  requires registration to download.
-* When you open a bug report there is no privacy. If the legitimacy of
-  the activity is deemed suspicous, I may flag it as suspicious,
-  making the issue even more easy to detect.
-
-Bug reports that violate a prerequisite may be discarded.
-
-Note that there are way more bug-fix requestors than there are bug
-fixers. If you want you need more immediate, confidential or urgent
-assistance
-
-http://www.crazy-compilers.com/decompyle/ offers a byte-code
-decompiler service for versions of Python up to 2.6.
-
--->
-
-## Description
-
-<!-- Add a clear and concise description of the bug. -->
-
-## How to Reproduce
-
-<!-- Please show both the input you gave and the
-output you got in describing how to reproduce the bug:
-
-or give a complete console log with input and output
-
-```console
-$ uncompyle6 <command-line-options>
-...
-$
-```
-
-Provide links to the Python bytecode. For example you can create a
-gist with the information. If you have the correct source code, you
-can add that too.
-
--->
-
-## Expected behavior
-
-<!-- Add a clear and concise description of what you expected to happen. -->
-
-## Environment
-
-<!-- _This section sometimes is optional but helpful to us._
-
-Please modify for your setup
-
-- Uncompyle6 version: output from  `uncompyle6 --version` or `pip show uncompyle6`
-- Python version: `python -V`
-- OS and Version: [e.g. Ubuntu bionic]
-
--->
-
-## Additional Environment or Context
-
-<!-- _This section is optional._
-
-Add any other context about the problem here or special environment setup.
-
--->

.github/ISSUE_TEMPLATE/feature-request.md

@@ -1,22 +0,0 @@
----
-name: Feature Request
-about: Tell us about a new feature that you would like to see in uncompyle6
-
----
-
-## Description
-
-<!-- Add a short description of the feature. This might
-include same input and output. -->
-
-## Background
-
-<!-- Add any additional background for the
-feature, for example: user scenarios, or the value of the feature. -->
-
-## Tests
-<!-- _This section is optional._
-
-Add text with suggestions on how to test the feature,
-if it is not obvious.
--->

.travis.yml

@@ -1,15 +1,9 @@
 language: python
 
-python:
-  - '3.5'
-  - '2.7'
-  - '3.4'
-  - '3.6'
+sudo: false
 
-matrix:
-  include:
-    - python: '3.7'
-      dist: xenial  # required for Python >= 3.7 (travis-ci/travis-ci#9069)
+python:
+  - '2.7' # this is a cheat here because travis doesn't do 2.4-2.6
 
 install:
 - pip install -e .

HISTORY.md

@@ -115,7 +115,7 @@ 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. A bit of this
-could have been easily added by modifying grammar rules.
+could have bene easily added by modifying grammar rules.
 
 This project, `uncompyle6`, abandons that approach for various
 reasons. Having a grammar per Python version is much cleaner and it

HOW-TO-REPORT-A-BUG.md

@@ -1,21 +1,6 @@
-<!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc-refresh-toc -->
-**Table of Contents**
+# How to report a Bug
 
-- [The difficulty of the problem](#the-difficulty-of-the-problem)
-- [Is it really a bug?](#is-it-really-a-bug)
-    - [Do you have valid bytecode?](#do-you-have-valid-bytecode)
-    - [Semantic equivalence vs. exact source code](#semantic-equivalence-vs-exact-source-code)
-- [What to send (minimum requirements)](#what-to-send-minimum-requirements)
-- [What to send (additional helpful information)](#what-to-send-additional-helpful-information)
-    - [But I don't *have* the source code!](#but-i-dont-have-the-source-code)
-    - [But I don't *have* the source code and am incapable of figuring how how to do a hand disassembly!](#but-i-dont-have-the-source-code-and-am-incapable-of-figuring-how-how-to-do-a-hand-disassembly)
-- [Narrowing the problem](#narrowing-the-problem)
-- [Karma](#karma)
-- [Confidentiality of Bug Reports](#confidentiality-of-bug-reports)
-- [Ethics](#ethics)
-
-<!-- markdown-toc end -->
-# The difficulty of the problem
+## The difficulty of the problem
 
 This decompiler is a constant work in progress: Python keeps
 changing, and so does its code generation.
@@ -48,7 +33,7 @@ prescribed cases, the ill-defined amorphous cases as well will get
 handled as well.
 
 In sum, you may need to do some work to have the bug you have found
-handled before the hundreds of other bugs, and other things I could be
+handled before the hundreds of other bugs, and things I could be
 doing.
 
 No one is getting paid to work to work on this project, let alone the
@@ -56,10 +41,10 @@ bugs you may have an interest in. If you require decompiling bytecode
 immediately, consider using a decompilation service, listed further
 down in this document.
 
-# Is it really a bug?
+## Is it really a bug?
 
 
-## Do you have valid bytecode?
+### 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
@@ -70,11 +55,11 @@ Python comes with a disassembly module called `dis`. A prerequisite
 module for this package, `xdis` has a cross-python version
 disassembler called `pydisasm`.
 
-## Semantic equivalence vs. exact source code
+### Semantic equivalence vs. exact source code
 
 Consider how Python compiles something like "(x*y) + 5". Early on
 Python creates an "abstract syntax tree" (AST) for this. And this is
-"abstract" in the sense that unimportant, redundant or unnecessary
+"abstract" in the sense that unimportant, redundant or unnecceary
 items have been removed. Here, this means that any notion that you
 wrote "x+y" in parenthesis is lost, since in this context they are
 unneeded. Also lost is the fact that the multiplication didn't have
@@ -147,7 +132,7 @@ Python will eliminate the entire "if" statement.
 So just because the text isn't the same, does not
 necessarily mean there's a bug.
 
-# What to send (minimum requirements)
+## What to send (minimum requirements)
 
 The basic requirement is pretty simple:
 
@@ -161,7 +146,7 @@ sending is too large.
 
 Also try to narrow the bug. See below.
 
-# What to send (additional helpful information)
+## 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
@@ -174,7 +159,7 @@ provide the input command and the output from that, please give:
 * Python interpreter version used
 
 
-## But I don't *have* the source code!
+### But I don't *have* the source code!
 
 Sure, I get it. No problem. There is Python assembly code on parse
 errors, so simply by hand decompile that. To get a full disassembly,
@@ -182,7 +167,7 @@ use `pydisasm` from the [xdis](https://pypi.python.org/pypi/xdis)
 package. Opcodes are described in the documentation for
 the [dis](https://docs.python.org/3.6/library/dis.html) module.
 
-### But I don't *have* the source code and am incapable of figuring how to do a hand disassembly!
+### But I don't *have* the source code and am incapable of figuring how how to do a hand disassembly!
 
 Well, you could learn. No one is born into this world knowing how to
 disassemble Python bytecode. And as Richard Feynman once said, "What
@@ -194,7 +179,7 @@ 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
+## 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).
@@ -212,53 +197,22 @@ what doesn't. That is useful. Or maybe the same file will decompile
 properly on a neighboring version of Python. That is helpful too.
 
 In sum, the more you can isolate or narrow the problem, the more
-likely the problem will be fixed and fixed sooner.
+likley the problem will be fixed and fixed sooner.
 
-# Karma
-
-I realize that following the instructions given herein puts a bit of
-burden on the bug reporter. In my opinion, this is justified as
-attempts to balance somewhat the burden and effort needed to fix the
-bug and the attempts to balance number of would-be bug reporters with
-the number of bug fixers. Better bug reporters are more likely to move
-in the category of bug fixers.
-
-The barrier to reporting a big is pretty small: all you really need is
-a github account, and the ability to type something after clicking
-some buttons. So the reality is that many people just don't bother to
-read these instructions, let alone follow it to any simulacrum.
-
-And the reality is also that bugs sometimes get fixed even though
-these instructions are not followed.
-
-So one factors I may take into consideration is the bug reporter's karma.
-
-* Have you demonstrably contributed to open source? I may look at your
-  github profile to see what contributions you have made, how popular
-  those contributions are, or how popular you are.
-* How appreciative are you? Have you starred this project that you are
-  seeking help from? Have you starred _any_ github project? And the above
-  two kind of feed into ...
-* Attitude. Some people feel that they are doing me and the world a
-  great favor by just pointing out that there is a problem whose solution
-  would greatly benefit them. Perhaps this is why they feel that
-  instructions are not to be followed by them, nor any need for
-  showing evidence gratitude when help is offered them.
-
-# Confidentiality of Bug Reports
+## 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 comments, and modify variable names
+However feel free to remove any commments, and modify variable names
 or constants in the source code.
 
-# Ethics
+## Ethics
 
 I do not condone using this program for unethical or illegal purposes.
-More detestable, at least to me, is asking for help to assist you in
+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

Makefile

@@ -40,8 +40,9 @@ check-3.0 check-3.1 check-3.2 check-3.6:
 check-3.7: pytest
 	$(MAKE) -C test check
 
-check-3.8:
-	$(MAKE) -C test check
+#:Tests for Python 2.4-2.5 (don't have pytest)
+check-2.4 check-2.5:
+	$(MAKE) -C test $@
 
 #:PyPy 2.6.1 PyPy 5.0.1, or PyPy 5.8.0-beta0
 # Skip for now

NEWS

@@ -1,187 +1,17 @@
-3.4.0 2019-08-24 Totoro
-=======================
-
-The main change is to add a tree-transformation phase. This simplifies the
-code a little and allows us to turn `if ...: raise AssertionError` into
-`assert`, and many `if ..: else if ...` into `if ... elif ..`
-
-Use options `--show=before` and `--show=after` to see the before the tree transformation phase and after the tree transformation phase.
-
-Most of the heavy lifting for this was done by x0ret.
-
-Other changes:
-
-- Fix issue #275, #283 (process to fix this bug is documented on wiki), #284
-- blacken more code
-- CircleCI adjustments for a changing CircleCi
-- Require more recent `xdis` for Python 3.8
-- Fix bugs in code using `BUILD_LIST_UNPACK` and variants
-
-3.3.5 2019-07-03 Pre Independence Day
-=====================================
-
-Again, most of the work in this is release is thanks to x0ret.
-
-- Handle annotation arguments in Python 3.x
-- Fix _vararg_ and function signatures in 3.x
-- Some 3.x < 3.6 `while` (1)/`if` fixes &mdash; others remain
-- Start reinstating `else if` -> `elif`
-- `LOAD_CONST` -> `LOAD_CODE` where appropriate
-- option `--weak-verify` is now `--syntax-verify`
-- code cleanups, start using [black](https://github.com/python/black) to reformat text
-
-
-3.3.4 2019-06-19 Fleetwood at 65
-================================
-
-Most of the work in this is release is thanks to x0ret.
-
-- Major work was done by x0ret to correct function signatures and include annotation types
-- Handle Python 3.6 `STORE_ANNOTATION` [#58](https://github.com/rocky/python-uncompyle6/issues/58)
-- Friendlier assembly output
-- `LOAD_CONST` replaced by `LOAD_STR` where appropriate to simplify parsing and improve clarity
-- remove unneeded parenthesis in a generator expression when it is the single argument to the function [#247](https://github.com/rocky/python-uncompyle6/issues/246)
-- Bug in noting an async function [#246](https://github.com/rocky/python-uncompyle6/issues/246)
-- Handle Unicode docstrings and fix docstring bugs [#241](https://github.com/rocky/python-uncompyle6/issues/241)
-- Add short option -T as an alternate for --tree+
-- Some grammar cleanup
-
-3.3.3 2019-05-19 Henry and Lewis
-================================
-
-As before, decomplation bugs fixed. The focus has primarily been on
-Python 3.7. But with this release, releases will be put on hold,as a
-better control-flow detection is worked on . This has been needed for a
-while, and is long overdue. It will probably also take a while to get
-done as good as what we have now.
-
-However this work will be done in a new project
-[decompyle3](https://github.com/rocky/python-decompile3).  In contrast
-to _uncompyle6_ the code will be written assuming a modern Python 3,
-e.g. 3.7. It is originally intended to decompile Python version 3.7
-and greater.
-
-* A number of Python 3.7+ chained comparisons were fixed
-* Revise Python 3.6ish format string handling
-* Go over operator precedence, e.g. for AST `IfExp`
-
-Reported Bug Fixes
-------------------
-
-* [#239: 3.7 handling of 4-level attribute import](https://github.com/rocky/python-uncompyle6/issues/239),
-* [#229: Inconsistent if block in python3.6](https://github.com/rocky/python-uncompyle6/issues/229),
-* [#227: Args not appearing in decompiled src when kwargs is specified explicitly (call_ex_kw)](https://github.com/rocky/python-uncompyle6/issues/227)
-2.7 confusion around "and" versus comprehension "if"
-* [#225: 2.7 confusion around "and" vs comprehension "if"](https://github.com/rocky/python-uncompyle6/issues/225)
-
-3.3.2 2019-05-03 Better Friday
-==============================
-
-As before, lots of decomplation bugs fixed. The focus has primarily
-been on Python 3.6. We can now parse the entire 3.6.8 Python library
-and verify that without an error. The same is true for 3.5.8. A number
-of the bugs fixed though are not contained to these versions. In fact
-some span back as far as 2.x
-
-But as before, many more remain in the 3.7 and 3.8 range which will
-get addressed in future releases
-
-Pypy 3.6 support was started. Pypy 3.x detection fixed (via `xdis`)
-
-3.3.1 2019-04-19 Good Friday
-==========================
-
-Lots of decomplation bugs, especially in the 3.x series fixed. Don't worry though, many more remain.
-
-* Add annotation return values in 3.6+
-* Fix 3.6+ lambda parameter handling decompilation
-* Fix 3.7+ chained comparison decompilation
-* split out semantic-action customization into more separate files
-* Add 3.8 try/else
-* Fix 2.7 generator decompilation
-* Fix some parser failures fixes in 3.4+ using test_pyenvlib
-* Add more run tests
-
-3.3.0 2019-04-14 Holy Week
-==========================
-
-* First cut at Python 3.8 (many bugs remain)
-* Reinstate -c | --compile (compile before disassembly) option
-* The usual smattering of bug and doc fixes
-
-3.2.6 2019-03-23 Mueller Report
-=======================================
-
-Mostly more of the same: bug fixes and pull requests.
-
-Bug Fixes
------------
-
-* [#221: Wrong grammar for nested ifelsestmt (in Python 3.7 at least)](https://github.com/rocky/python-uncompyle6/issues/221)
-* [#215: 2.7 can have two JUMP_BACKs at the end of a while loop](https://github.com/rocky/python-uncompyle6/issues/215)
-* [#209: Fix "if" return boundary in 3.6+](https://github.com/rocky/python-uncompyle6/issues/209),
-* [#208: Comma placement in 3.6 and 3.7 **kwargs](https://github.com/rocky/python-uncompyle6/issues/208),
-* [#200: Python 3 bug in not detecting end bounds of an "if" ... "elif"](https://github.com/rocky/python-uncompyle6/issues/200),
-* [#155: Python 3.x bytecode confusing "try/else" with "try" in a loop](https://github.com/rocky/python-uncompyle6/issues/155),
-
-
-Pull Requests
-----------------
-
-* [#202: Better "assert" statement determination in Python 2.7](https://github.com/rocky/python-uncompyle6/pull/211)
-* [#204: Python 3.7 testing](https://github.com/rocky/python-uncompyle6/pull/204)
-* [#205: Run more f-string tests on Python 3.7](https://github.com/rocky/python-uncompyle6/pull/205)
-* [#211: support utf-8 chars in Python 3 sourcecode](https://github.com/rocky/python-uncompyle6/pull/202)
-
-
-
-3.2.5 2018-12-30 Clear-out sale
-======================================
-
-- 3.7.2 Remove deprecation warning on regexp string that isn't raw
-- main.main() parameter `codes` is not used - note that
-- Improve Python 3.6+ control flow detection
-- More complete fragment instruction annotation for `imports`
-
-3.2.4 2018-10-27 7x9 release
-===================================
-
-- Bug fixes #180, #182, #187, #192
-- Enhancements #189
-- Internal improvements
-
-3.2.3 2018-06-04 Michael Cohen flips and Fleetwood Redux
-======================================================================
-- Python 1.3 support 3.0 bug and
-- fix botched parameter ordering of 3.x in last release
-
-3.2.2 2018-06-04 When I'm 64
-===================================
-
-- Python 3.0 support and bug fixes
-
-3.2.1 2018-06-04 MF
-=======================
-
-- Python 1.4 and 1.5 bug fixes
-
-3.2.0 2018-05-19 Rocket Scientist
-=========================================
+uncompyle6 3.2.0 2018-05-19 Rocket Scientist
 
 - Add rudimentary 1.4 support (still a bit buggy)
 - add --tree+ option to show formatting rule, when it is constant
-- Python 2.7.15candidate1 support (via `xdis`)
+- Python 2.7.15candidate1 support (via xdis)
 - bug fixes, especially for 3.7 (but 2.7 and 3.6 and others as well)
 
-3.1.3 2018-04-16
-====================
+uncompyle6 3.1.3 2018-04-16
 
 - Add some Python 3.7 rules, such as for handling LOAD_METHOD (not complete)
 - Fix some fragment bugs
 - small doc changes
 
-3.1.2 2018-04-08 Eastern Orthodox Easter
-==================================================
+uncompyle6 3.1.2 2018-04-08 Eastern Orthodox Easter
 
 - Python 3.x subclass and call parsing fixes
 - Allow/note running on Python 3.1
@@ -189,8 +19,7 @@ Pull Requests
 - DRY instruction building code between 2.x and 3.x
 - expand testing
 
-3.1.1 2018-04-01 Easter April Fool's
-=============================================
+uncompyle6 3.1.1 2018-04-01 Easter April Fool's
 
 Jesus on Friday's New York Times puzzle: "I'm stuck on 2A"
 
@@ -200,20 +29,18 @@ Jesus on Friday's New York Times puzzle: "I'm stuck on 2A"
 - reduce 3.5, 3.6 control-flow bugs
 - reduce ambiguity in rules that lead to long (exponential?) parses
 - limit/isolate some 2.6/2.7,3.x grammar rules
-- more run-time testing of decompiled code
-- more removal of parenthesis around calls via setting precedence
+- more runtime testing of decompiled code
+- more removal of parenthesis around calls via setting precidence
 
-3.1.0 2018-03-21 Equinox
-==============================
+uncompyle6 3.1.0 2018-03-21 Equinox
 
 - Add code_deparse_with_offset() fragment function.
-- Correct parameter call fragment deparse_code()
+- Correct paramenter call fragment deparse_code()
 - Lots of 3.6, 3.x, and 2.7 bug fixes
   About 5% of 3.6 fail parsing now. But
   semantics still needs much to be desired.
 
-3.0.1 2018-02-17
-====================
+uncompyle6 3.0.1 2018-02-17
 
 - All Python 2.6.9 standard library files weakly verify
 - Many 3.6 fixes. 84% of the first 200 standard library files weakly compile.
@@ -223,8 +50,7 @@ Jesus on Friday's New York Times puzzle: "I'm stuck on 2A"
 - And more add tests target previous existing bugs more completely
 - sync recent license changes in metadata
 
-3.0.0 2018-02-17
-====================
+uncompyle6 3.0.0 2018-02-17
 
 - deparse_code() and lookalikes from the various semantic actions are
   now deprecated. Instead use new API code_deparse() which makes the
@@ -246,8 +72,7 @@ A bit more work is still needed for 3.6 especially in the area of
 function calls and definitions.
 
 
-2.16.0 2018-02-17
-=====================
+uncompyle6 2.16.0 2018-02-17
 
 - API additions:
   - add fragments.op_at_code_loc() and
@@ -259,84 +84,76 @@ function calls and definitions.
 - Fix Python 3.5+ CALL_FUNCTION_VAR and BUILD_LIST_UNPACK in call; with this
   we can can handle 3.5+ f(a, b, *c, *d, *e) now
 
-2.15.1 2018-02-05
-=====================
+uncompyle6 2.15.1 2018-02-05
 
 - More bug fixes and revert an improper bug fix in 2.15.0
 
-2.15.0 2018-02-05 pycon2018.co
-=====================================
+uncompyle6 2.15.0 2018-02-05 pycon2018.co
 
 - Bug fixes
 - Code fragment improvements
 - Code cleanups
 - Expand testing
 
-2.15.1 2018-01-27
-=====================
+uncompyle6 2.15.1 2018-01-27
 
-- Add `--linemap` option to give line correspondences
+- Add --linemap option to give line correspondences
   between original source lines and reconstructed line sources.
   It is far from perfect, but it is a start
 - Add a new class of tests: tests which when decompiled check themselves
 - Split off Python version semantic action customizations into its own file
-- Fix 2.7 bug in `if`/`else` loop statement
-- Handle 3.6+ `EXTENDED_ARG`s for `POP_JUMP_IF..` instructions
-- Correct 3.6+ calls with `kwargs`
+- Fix 2.7 bug in ifelse loop statement
+- Handle 3.6+ EXTENDED_ARGs for POP_JUMP_IF... instructions
+- Correct 3.6+ calls with kwargs
 - Describe the difficulty of 3.6 in README
 
-2.14.3 2018-01-19
-=====================
+uncompyle6 2.14.3 2018-01-19
 
-- Fix bug in 3.5+ `await` statement
+- Fix bug in 3.5+ await stmt
 - Better version to magic handling; handle 3.5.2 .. 3.5.4 versions
 - Improve/correct test_pyenvlib.py status messages
 - Fix some 2.7 and 2.6 parser bugs
-- Fix `whilelse` parsing bugs
+- Fix whilelse parsing bugs
 - Correct 2.5- decorator parsing
 - grammar for decorators matches AST a little more
 - better tests in setup.py for running the right version of Python
 - Fix 2.6- parsing of "for .. try/else" ...  with "continue"  inside
 
-2.14.2 2018-01-09 Samish
-==============================
+uncompyle6 2.14.2 2018-01-09 Samish
 
 Decompilation bug fixes, mostly 3.6 and pre 2.7
 
-- 3.6 `FUNCTION_EX` (somewhat)
-- 3.6 `FUNCTION_EX_KW` fixes
-- 3.6 `MAKE_FUNCTION` fixes
-- correct 3.5 `CALL_FUNCTION_VAR`
+- 3.6 FUNCTION_EX (somewhat)
+- 3.6 FUNCTION_EX_KW fixes
+- 3.6 MAKE_FUNCTION fixes
+- correct 3.5 CALL_FUNCTION_VAR
 - stronger 3.x "while 1" testing
 - Fix bug in if's with "pass" bodies. Fixes #104
 - try/else and try/finally fixes on 2.6-
 - limit pypy customization to pypy
-- Add addr fields in `COME_FROM`S
+- Add addr fields in COME_FROMS
 - Allow use of full instructions in parser reduction routines
 - Reduce grammar in Python 3 by specialization more to specific
   Python versions
 - Match Python AST names more closely when possible
 
-2.14.1 2017-12-10 Dr. Gecko
-===================================
+uncompyle6 2.14.1 2017-12-10 Dr. Gecko
 
-- Many decompilation bug fixes
+- Many decompilation bugfixes
 - Grammar rule reduction and version isolation
 - Match higher-level nonterminal names more closely
   with Python AST
-- Start automated Python _stdlib_ testing &mdash; full round trip
+- Start automated Python stdlib testing - full round trip
 
-2.14.0 2017-11-26 johnnybamazing
-=========================================
+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 rigorous testing
+- Add stdlib/runtests.sh for even more rigorous testing
 
-2.13.3 2017-11-13
-=====================
+uncompyle6 2.13.3 2017-11-13
 
 Overall: better 3.6 decompiling and some much needed code refactoring and cleanup
 
@@ -349,145 +166,130 @@ Overall: better 3.6 decompiling and some much needed code refactoring and cleanu
   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.
+- 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()
+- 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 via `import Queue`
+- Distinguish RETURN_VALUE from RETURN_END_IF in exception bodies better in 3.6
+- bug in 3.x language changes: import queue via import Queue
 - reinstate some bytecode tests since decompiling has gotten better
 - Revise how to report a bug
 
-2.13.2 2017-10-12
-=====================
+uncompyle6 2.13.2 2017-10-12
 
 - Re-release using a more automated approach
 
-2.13.1 2017-10-11
-=====================
+uncompyle6 2.13.1 2017-10-11
 
 - Re-release because Python 2.4 source uploaded rather than 2.6-3.6
 
-2.13.0 2017-10-10
-=====================
+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
+- Update to use xdis 3.7.0 or greater
 
-2.12.0 2017-09-26
-=====================
+uncompyle6 2.12.0 2017-09-26
 
-- Use `xdis` 3.6.0 or greater now
+- 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
 
-2.11.5 2017-08-31
-=====================
+uncompyle6 2.11.5 2017-08-31
 
 - Skeletal support for Python 3.7
 
-2.11.4 2017-08-15
-=====================
+uncompyle6 2.11.4 2017-08-15
 
-* scanner and parser now allow 3-part version string look ups,
+* scanner and parser now allow 3-part version string lookups,
   e.g. 2.7.1 We allow a float here, but if passed a string like '2.7'. or
-* unpin 3.5.1. `xdis` 3.5.4 has been release and fixes the problems we had. Use that.
-* some routines here moved to `xdis`. Use the `xdis` version
-* `README.rst`: Link typo Name is _trepan2_ now not _trepan_
-* xdis-forced change adjust for `COMPARE_OP` "is-not" in
-  semantic routines. We need "is not".
+* unpin 3.5.1. xdis 3.5.4 has been release and fixes the problems we had. Use that.
+* some routines here moved to xdis. Use the xdis version
+* README.rst: Link typo Name is trepan2 now not trepan
+* xdis-forced change adjust for COMPARE_OP "is-not" in
+  semanatic routines. We need "is not".
 * Some PyPy tolerance in validate testing.
 * Some pyston tolerance
 
-2.11.3 2017-08-09
-=====================
+uncompyle6 2.11.3 2017-08-09
 
 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"
+- use newer xdis, but not too new; 3.5.2 breaks uncompyle6
+- use xdis opcode sets
+- xdis "exception match" is now "exception-match"
 
-2.11.2 2017-07-09
-=====================
+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
+- 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
 
-2.11.1 2017-06-25
-=====================
+uncompyle6 2.11.1 2017-06-25
 
 - Python 3.x annotation and function signature fixes
-- Bump `xdis` version
-- Small `pysource.py` bug fixes
-
-2.11.0 2017-06-18 Fleetwood
-==================================
+- Bump xdis version
+- Small pysource bug fixes
 
+uncompyle6 2.11.0 2017-06-18 Fleetwood
 - Major improvements in fragment tracking
-  * Add nonterminal node in `extractInfo()`
+  * Add nonterminal node in extractInfo
   * tag more offsets in expressions
   * tag array subscripts
-  * set `YIELD` value offset in a _yield expr_
+  * set YIELD value offset in a <yield> expr
   * fix a long-standing bug in not adjusting final AST when melding other deparse ASTs
 - Fixes yet again for make_function node handling; document what's up here
-- Fix bug in snowflake Python 3.5 `*args`, `kwargs`
+- Fix bug in snowflake Python 3.5 *args kwargs
 
-2.10.1 2017-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()`
+  - was returning the wrong type sometimes in deparse_code_around_offset()
   - capture function name in offsets
-  - track changes to `ifelstrmtr` node from `pysource.py` into fragments
+  - track changes to ifelstrmtr node from pysource into fragments
 
-2.10.0 2017-05-30 Elaine Gordon
-=======================================
+uncompyle6 2.10.0 2017-05-30 Elaine Gordon
 
 - Add fuzzy offset deparse look up
 - 3.6 bug fixes
-   - fix `EXTENDED_ARGS` handling (and in 2.6 and others)
+   - fix EXTENDED_ARGS handling (and in 2.6 and others)
    - semantic routine make_function fragments.py
-   - `MAKE_FUNCTION` handling
-   - `CALL_FUNCTION_EX` handling
-   - `async` property on `defs`
-   - support for `CALL_FUNCTION_KW` (moagstar)
-- 3.5+ `UNMAP_PACK` and` BUILD_UNMAP_PACK` handling
+   - MAKE_FUNCTION handling
+   - CALL_FUNCTION_EX handling
+   - async property on defs
+   - support for CALL_FUNCTION_KW (moagstar)
+- 3.5+ UNMAP_PACK and BUILD_UNMAP_PACK handling
 - 3.5 FUNCTION_VAR bug
-- 3.x pass statement inside `while True`
+- 3.x pass statement insdie while True
 - Improve 3.2 decompilation
-- Fixed `-o` argument processing (grkov90)
+- Fixed -o argument processing (grkov90)
 - Reduce scope of LOAD_ASSERT as expr to 3.4+
-- `await` statement fixes
+- "await" statement fixes
 - 2.3, 2.4 "if 1 .." fixes
 - 3.x annotation fixes
 
-2.9.11 2017-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
+- 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
 
-2.9.10 2017-02-25
-=====================
+uncompyle6 2.9.10 2017-02-25
 
 - Python grammar rule fixes
 - Add ability to get grammar coverage on runs
-- Handle Python 3.6 opcode `BUILD_CONST_KEYMAP`
+- Handle Python 3.6 opcode BUILD_CONST_KEYMAP
 
-2.9.9 2016-12-16
+uncompyle6 2.9.9 2016-12-16
 
 - Remaining Python 3.5 ops handled
   (this also means more Python 3.6 ops are handled)
@@ -497,33 +299,30 @@ Very minor changes
 - Better control-flow detection
 - Code cleanups and misc bug fixes
 
-2.9.8 2016-12-16
-====================
+uncompyle6 2.9.8 2016-12-16
 
 - Better control-flow detection
-- pseudo instruction `THEN` in 2.x
+- pseudo instruction THEN in 2.x
   to disambiguate if from and
-- fix bug in `--verify` option
+- fix bug in --verify option
 - DRY (a little) control-flow detection
 - fix syntax in tuples with one element
 - if AST rule inheritance in Python 2.5
-- `NAME_MODULE` removal for Python <= 2.4
+- NAME_MODULE removal for Python <= 2.4
 - verify call fixes for Python <= 2.4
 - more Python lint
 
-2.9.7 2016-12-16
-====================
+uncompyle6 2.9.7 2016-12-16
 
 - Start to handle 3.5/3.6 build_map_unpack_with_call
 - Some Python 3.6 bytecode to wordcode conversion fixes
 - option -g: show start-end range when possible
 - track print_docstring move to help (used in python 3.1)
-- verify: allow `RETURN_VALUE` to match `RETURN_END_IF`
+- verify: allow RETURN_VALUE to match RETURN_END_IF
 - some 3.2 compatibility
-- Better Python 3 control flow detection by adding Pseudo `ELSE` opcodes
+- Better Python 3 control flow detection by adding Pseudo ELSE opcodes
 
-2.9.6 2016-12-04
-====================
+uncompyle6 2.9.6 2016-12-04
 
 - Shorten Python3 grammars with + and *
   this requires spark parser 1.5.1
@@ -531,12 +330,11 @@ Very minor changes
   decompile accuracy. This too requires
   spark parser 1.5.1
 
-2.9.6 2016-11-20
-====================
+uncompyle6 2.9.6 2016-11-20
 
 - Correct MANIFEST.in
 - More AST grammar checking
-- `--linemapping` option or _linenumbers.line_number_mapping()_
+- --linemapping option or linenumbers.line_number_mapping()
   Shows correspondence of lines between source
   and decompiled source
 - Some control flow adjustments in code for 2.x.
@@ -549,33 +347,30 @@ Very minor changes
 - Python 2 and 3 detect structure code is more similar
 - Handle Docstrings with embedded triple quotes (""")
 
-2.9.5 2016-11-13
-====================
+uncompyle6 2.9.5 2016-11-13
 
 - Fix Python 3 bugs:
   * improper while 1 else
   * docstring indent
   * 3.3 default values in lambda expressions
-  * start 3.0 decompilation (needs newer `xdis`)
+  * start 3.0 decompilation (needs newer xdis)
 - Start grammar misparse checking
 
 
-2.9.4 2016-11-02
-====================
+uncompyle6 2.9.4 2016-11-02
 
 - Handle Python 3.x function annotations
 - track def keyword-parameter line-splitting in source code better
 - bump min xdis version to mask previous xdis bug
 
-2.9.3 2016-10-26
-====================
+uncompyle6 2.9.3 2016-10-26
 
-Release forced by incompatibility change in` xdis` 3.2.0.
+Release forced by incompatibility change in xdis 3.2.0.
 
 - Python 3.1 bugs:
-  * handle `with`... `as`
-  * handle `with`
-  * Start handling `def` (...) -> _yy_ (has bugs still)
+  * handle "with ... as"
+  * handle "with"
+  * Start handling def (...) -> yy (has bugs still)
 
 - DRY Python 3.x via inheritance
 - Python 3.6 work (from Daniel Bradburn)
@@ -583,8 +378,7 @@ Release forced by incompatibility change in` xdis` 3.2.0.
   * Handle 3.6 handle single and multiple fstring better
 
 
-2.9.2 2016-10-15
-====================
+uncompyle6 2.9.2 2016-10-15
 
 - use source-code line breaks to assist in where to break
   in tuples and maps
@@ -592,34 +386,30 @@ Release forced by incompatibility change in` xdis` 3.2.0.
 - Fix some Python 2.6 and below bugs
 - DRY fragments.py code a little
 
-2.9.1 2016-10-09
-====================
+uncompyle6 2.9.1 2016-10-09
 
 - Improved Python 1.5 decompiling
 - Handle old-style pre Python 2.2 classes
 
-2.9.0 2016-10-09
-====================
+uncompyle6 2.9.0 2016-10-09
 
-- Use `xdis` 3.0.0 protocol `load_module`.
+- Use xdis 3.0.0 protocol load_module.
   this Forces change in requirements.txt and _pkg_info_.py
 - Start Python 1.5 decompiling; another round of work is needed to
   remove bugs
 - Simplify python 2.1 grammar
-- Fix bug with `-t` ...  Wasn't showing source text when `-t` option was given
+- Fix bug with -t ...  Wasn't showing source text when -t option was given
 - Fix 2.1-2.6 bug in list comprehension
 
-2.8.4 2016-10-08
-====================
+uncompyle6 2.8.4 2016-10-08
 
 - Python 3 disassembly bug fixes
 - Python 3.6 fstring bug fixes (from moagstar)
 - Python 2.1 disassembly
-- `COME_FROM` suffixes added in Python3
-- use `.py` extension in verification disassembly
+- COME_FROM suffixes added in Python3
+- use .py extension in verification disassembly
 
-2.8.3 2016-09-11 live from NYC!
-=======================================
+uncompyle6 2.8.3 2016-09-11 live from NYC!
 
 NOTE: this is possibly the last release before a major reworking of
 control-flow structure detection is done.
@@ -647,25 +437,22 @@ control-flow structure detection is done.
 - bump xdis requirement so we can deparse dropbox 2.5 code
 - Added H. Goebel's changes before 2.4 in DECOMPYLE-2.4-CHANGELOG.txt
 
-2.8.2 2016-08-29
-====================
+uncompyle6 2.8.2 2016-08-29
 
 - Handle Python 3.6 format string conversions !r, !s, !a
 - Start to handle 3.1 bytecode
 - Fix some PyPy translation bugs
 - We now only handle 3.6.0a3+ since that is incompatible with 3.6 before that
 
-2.8.1 2016-08-20
-====================
+uncompyle6 2.8.1 2016-08-20
 
 - Add Python 2.2 decompilation
 
 - Fix bugs
- * PyPy `LOOKUP_METHOD` bug
- * Python 3.6 `FORMAT_VALUE` handles expressions now
+ * PyPy LOOKUP_METHOD bug
+ * Python 3.6 FORMAT_VALUE handles expressions now
 
-2.8.0 2016-08-03
-====================
+uncompyle6 2.8.0 2016-08-03
 
 - Start Python 3.6 support (moagstar)
   more work on PEP 498 needed
@@ -676,23 +463,20 @@ control-flow structure detection is done.
 - better grammar and semantic action segregation based
   on python bytecode version
 
-2.7.1 2016-07-26
-====================
+uncompyle6 2.7.1 2016-07-26
 
 - PyPy bytecodes for 2.7 and 3.2 added
 - Instruction formatting improved slightly
 - 2.7 bytecode "continue" bug fixed
 
-2.7.0 2016-07-15
-====================
+uncompyle6 2.7.0 2016-07-15
 
 - 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.
 
-2.6.2 2016-07-11 Manhattenhenge
-=======================================
+uncompyle6 2.6.2 2016-07-11 Manhattenhenge
 
 - Extend bytecodes back to 2.3
 - Fix bugs:
@@ -701,25 +485,22 @@ control-flow structure detection is done.
   * continue statements
 - DRY and segregate grammar more
 
-2.6.1 2016-07-08
-====================
+uncompyle6 2.6.1 2016-07-08
 
 - Go over Python 2.5 bytecode deparsing
   all library programs now deparse
 - Fix a couple bugs in 2.6 deparsing
 
-2.6.0 2016-07-07
-====================
+uncompyle6 2.6.0 2016-07-07
 
 - Improve Python 2.6 bytecode deparsing:
-  _stdlib_ now will deparse something
+  stdlib now will deparse something
 - Better <2.6 vs. 2.7 grammar separation
 - Fix some 2.7 deparsing bugs
 - Fix bug in installing uncompyle6 script
 - Doc improvements
 
-2.5.0 2016-06-22 Summer Solstice
-========================================
+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
@@ -728,8 +509,7 @@ control-flow structure detection is done.
 - Better fragment offset tracking
 - Some (much-needed) code refactoring
 
-2.4.0 2016-05-18 (in memory of Lewis Bernstein)
-===========================================================
+uncompyle6 2.4.0 2016-05-18 (in memory of Lewis Bernstein)
 
 - Many Python 3 bugs fixed:
   * Python 3.2 to 3.5 libraries largely
@@ -744,8 +524,7 @@ control-flow structure detection is done.
   * handle complex number unmarshaling
   * Running on Python 2 to works on Python 3.5 bytecodes now
 
-2.3.5 and 2.3.6 2016-05-14
-=================================
+uncompyle6 2.3.5 and 2.3.6 2016-05-14
 
 - Python 2 class decorator fix (thanks to Tey)
 - Fix fragment parsing bugs
@@ -757,77 +536,67 @@ control-flow structure detection is done.
 - Correct history based on info from Dan Pascu
 - Fix up pip packaging, ugh.
 
-2.3.4 2016-05-5
-===================
+uncompyle6 2.3.4 2016-05-5
 
 - More Python 3.5 parsing bugs addressed
 - decompiling Python 3.5 from other Python versions works
 - test from Python 3.2
 - remove "__module__ = __name__" in 3.0 <= Python 3.2
 
-2.3.3 2016-05-3
-===================
+uncompyle6 2.3.3 2016-05-3
 
 - Fix bug in running uncompyle6 script on Python 3
 - Speed up performance on deparsing long lists by grouping in chunks of 32 and 256 items
 - DRY Python expressions between Python 2 and 3
 
-2.3.2 2016-05-1
-===================
+uncompyle6 2.3.2 2016-05-1
 
-- Add `--version` option standalone scripts
+- Add --version option standalone scripts
 - Correct License information in package
-- expose functions `uncompyle_file()`, `load_file()`, and `load_module()`
+- expose fns uncompyle_file, load_file, and load_module
 - Start to DRY Python2 and Python3 grammars Separate out 3.2, and 3.5+
   specific grammar code
 - Fix bug in 3.5+ constant map parsing
 
-2.3.0, 2.3.1 2016-04-30
-=============================
+uncompyle6 2.3.0, 2.3.1 2016-04-30
 
-- Require `spark_parser` >= 1.1.0
+- Require spark_parser  >= 1.1.0
 
-2.2.0 2016-04-30
-====================
+uncompyle6 2.2.0 2016-04-30
 
-- Spark is no longer here but pulled separate package [spark_parser](https://pypi.org/project/spark_parser/)
+- Spark is no longer here but pulled separate package spark_parse
 - Python 3 parsing fixes
 - More tests
 
-2.2.0 2016-04-02
-====================
+uncompyle6 2.2.0 2016-04-02
 
 - 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)
+- Fix bug in uncomplye6 -d and -r options (via lelicopter)
 
 
-2.1.3 2016-01-02
-====================
+uncompyle6 2.1.3 2016-01-02
 
 - Limited support for decompiling Python 3.5
 - Improve Python 3 class deparsing
-- Handle `MAKE_CLOSURE` opcode
+- Handle MAKE_CLOSURE opcode
 - Start to DRY opcode code.
 - increase test coverage
 - fix misc small bugs and some improvements
 
-2.1.2 2015-12-31
-====================
+uncompyle6 2.1.2 2015-12-31
 
 - Fix cross-version Marshal loading
 - Handle Python 3.3 . dotted class names
 - Limited 3.5 support: allows deparsing other versions
 - Refactor code more, misc bug fixes
 
-2.1.1 2015-12-27
-====================
+uncompyle6 2.1.1 2015-12-27
 
 - packaging issues
 
-2.1.0 2015-12-27
-====================
+uncompyle6 2.1.0 2015-12-27
 
 - Python 3.x deparsing much more solid
 - Better cross-version deparsing
@@ -836,8 +605,7 @@ Some bugs squashed while other run rampant. Some code cleanup while
 much more is yet needed. More tests added, but many more are needed.
 
 
-2.0.0 2015-12-11
-====================
+uncompyle6 2.0.0 2015-12-11
 
 Changes from uncompyle2
 
@@ -850,5 +618,5 @@ Changes from uncompyle2
 
 SPARK:
   add option to show grammar rules applied
-  allow Python-style `#` comments in grammar
+  allow Python-style # comments in grammar
   Runs on Python 3 and Python 2

README.rst

@@ -1,6 +1,4 @@
-|buildstatus| |Latest Version| |Supported Python Versions|
-
-|packagestatus|
+|buildstatus|
 
 uncompyle6
 ==========
@@ -13,9 +11,8 @@ Introduction
 ------------
 
 *uncompyle6* translates Python bytecode back into equivalent Python
-source code. It accepts bytecodes from Python version 1.3 to version
-3.8, spanning over 24 years of Python releases. We include Dropbox's
-Python 2.5 bytecode and some PyPy bytecode.
+source code. It accepts bytecodes from Python version 1.5, and 2.1 to
+3.7 or so, including PyPy bytecode and Dropbox's Python 2.5 bytecode.
 
 Why this?
 ---------
@@ -32,11 +29,11 @@ CPython bytecode decompilers is the ability to deparse just
 *fragments* of source code and give source-code information around a
 given bytecode offset.
 
-I use the tree fragments to deparse fragments of code *at run time*
-inside my trepan_ debuggers_. For that, bytecode offsets are recorded
-and associated with fragments of the source code. This purpose,
-although compatible with the original intention, is yet a little bit
-different.  See this_ for more information.
+I use the tree fragments to deparse fragments of code inside my
+trepan_ debuggers_. For that, bytecode offsets are recorded and
+associated with fragments of the source code. This purpose, although
+compatible with the original intention, is yet a little bit different.
+See this_ for more information.
 
 Python fragment deparsing given an instruction offset is useful in
 showing stack traces and can be encorporated into any program that
@@ -61,7 +58,7 @@ provides decompilation for subset of Python versions, we generally do
 demonstrably better for those as well.
 
 How can we tell? By taking Python bytecode that comes distributed with
-that version of Python and decompiling these.  Among those that
+that version of Python and decompiling these.  Among htose that
 successfully decompile, we can then make sure the resulting programs
 are syntactically correct by running the Python interpreter for that
 bytecode version.  Finally, in cases where the program has a test for
@@ -78,7 +75,7 @@ Requirements
 The code here can be run on Python versions 2.6 or later, PyPy 3-2.4,
 or PyPy-5.0.1.  Python versions 2.4-2.7 are supported in the
 python-2.4 branch.  The bytecode files it can read have been tested on
-Python bytecodes from versions 1.4, 2.1-2.7, and 3.0-3.8 and the
+Python bytecodes from versions 1.5, 2.1-2.7, and 3.0-3.6 and the
 above-mentioned PyPy versions.
 
 Installation
@@ -95,8 +92,8 @@ This uses setup.py, so it follows the standard Python routine:
 A GNU makefile is also provided so :code:`make install` (possibly as root or
 sudo) will do the steps above.
 
-Running Tests
--------------
+Testing
+-------
 
 ::
 
@@ -124,32 +121,16 @@ For usage help:
 
    $ uncompyle6 -h
 
-Verification
-------------
+If you want strong verification of the correctness of the
+decompilation process, add the `--verify` option. But there are
+situations where this will indicate a failure, although the generated
+program is semantically equivalent. Using option `--weak-verify` will
+tell you if there is something definitely wrong. Generally, large
+swaths of code are decompiled correctly, if not the entire program.
 
-In older versions of Python it was possible to verify bytecode by
-decompiling bytecode, and then compiling using the Python interpreter
-for that bytecode version. Having done this the bytecode produced
-could be compared with the original bytecode. However as Python's code
-generation got better, this no longer was feasible.
+You can also cross compare the results with pycdc_ . Since they work
+differently, bugs here often aren't in that, and vice versa.
 
-If you want Python syntax verification of the correctness of the
-decompilation process, add the :code:`--syntax-verify` option. However since
-Python syntax changes, you should use this option if the bytecode is
-the right bytecode for the Python interpreter that will be checking
-the syntax.
-
-You can also cross compare the results with another python decompiler
-like pycdc_ . Since they work differently, bugs here often aren't in
-that, and vice versa.
-
-There is an interesting class of these programs that is readily
-available give stronger verification: those programs that when run
-test themselves. Our test suite includes these.
-
-And Python comes with another a set of programs like this: its test
-suite for the standard library. We have some code in :code:`test/stdlib` to
-facilitate this kind of checking too.
 
 Known Bugs/Restrictions
 -----------------------
@@ -164,6 +145,27 @@ All of the Python decompilers that I have looked at have problems
 decompiling Python's control flow. In some cases we can detect an
 erroneous decompilation and report that.
 
+In older versions of Python it was possible to verify bytecode by
+decompiling bytecode, and then compiling using the Python interpreter
+for that bytecode version. Having done this the bytecode produced
+could be compared with the original bytecode. However as Python's code
+generation got better, this is no longer feasible.
+
+There is a kind of *weak verification* that we use that doesn't check
+bytecode for equivalence but does check to see if the resulting
+decompiled source is a valid Python 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 was used
+in creating the bytecode.
+
+There are however an interesting class of these programs that is
+readily available give stronger verification: those programs that
+when run check some computation, or even better themselves.
+
+And already Python has a set of programs like this: the test suite
+for the standard library that comes with Python. We have some
+code in `test/stdlib` to facilitate this kind of checking.
+
 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
@@ -172,31 +174,25 @@ that era was minimal)
 
 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.6, and 2.0.
+interpreter for versions 1.5, 1.6, and 2.0.
 
 In the Python 3 series, Python support is is strongest around 3.4 or
 3.3 and drops off as you move further away from those versions. Python
-3.0 is weird in that it in some ways resembles 2.6 more than it does
-3.1 or 2.7. Python 3.6 changes things drastically by using word codes
-rather than byte codes. As a result, the jump offset field in a jump
-instruction argument has been reduced. This makes the :code:`EXTENDED_ARG`
-instructions are now more prevalent in jump instruction; previously
-they had been rare.  Perhaps to compensate for the additional
-:code:`EXTENDED_ARG` instructions, additional jump optimization has been
-added. So in sum handling control flow by ad hoc means as is currently
-done is worse.
+3.6 changes things drastically by using word codes rather than byte
+codes. As a result, the jump offset field in a jump instruction
+argument has been reduced. This makes the `EXTENDED_ARG` instructions
+are now more prevalent in jump instruction; previously they had been
+rare.  Perhaps to compensate for the additional `EXTENDED_ARG`
+instructions, additional jump optimization has been added. So in sum
+handling control flow by ad hoc means as is currently done is worse.
 
-Between Python 3.5, 3.6 and 3.7 there have been major changes to the
-:code:`MAKE_FUNCTION` and :code:`CALL_FUNCTION` instructions.
+Also, between Python 3.5, 3.6 and 3.7 there have been major changes to the
+`MAKE_FUNCTION` and `CALL_FUNCTION` instructions.
 
 Currently not all Python magic numbers are supported. Specifically in
 some versions of Python, notably Python 3.6, the magic number has
-changes several times within a version.
-
-**We support only released versions, not candidate versions.** Note however
-that the magic of a released version is usually the same as the *last* candidate version prior to release.
-
-There are also customized Python interpreters, notably Dropbox,
+changes several times within a version. We support only the released
+magic. There are also customized Python interpreters, notably Dropbox,
 which use their own magic and encrypt bytcode. With the exception of
 the Dropbox's old Python 2.5 interpreter this kind of thing is not
 handled.
@@ -216,18 +212,17 @@ There is lots to do, so please dig in and help.
 See Also
 --------
 
-* https://github.com/zrax/pycdc : purports to support all versions of Python. It is written in C++ and is most accurate for Python versions around 2.7 and 3.3 when the code was more actively developed. Accuracy for more recent versions of Python 3 and early versions of Python are especially lacking. See its `issue tracker <https://github.com/zrax/pycdc/issues>`_ for details. Currently lightly maintained.
-* 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. Currently unmaintained.
-* https://github.com/figment/unpyc3/ : fork of above, but supports Python 3.3 only. Includes some fixes like supporting function annotations. Currently unmaintained.
-* https://github.com/wibiti/uncompyle2 : supports Python 2.7 only, but does that fairly well. There are situations where :code:`uncompyle6` results are incorrect while :code:`uncompyle2` results are not, but more often uncompyle6 is correct when uncompyle2 is not. Because :code:`uncompyle6` adheres to accuracy over idiomatic Python, :code:`uncompyle2` can produce more natural-looking code when it is correct. Currently :code:`uncompyle2` is lightly maintained. See its issue `tracker <https://github.com/wibiti/uncompyle2/issues>`_ for more details
-* `How to report a bug <https://github.com/rocky/python-uncompyle6/blob/master/HOW-TO-REPORT-A-BUG.md>`_
+* https://github.com/zrax/pycdc : supports all versions of Python and is written in C++. Support for Python 3 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
 * 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
 * https://github.com/rocky/python-xasm : Cross Python version assembler
 * https://github.com/rocky/python-uncompyle6/wiki : Wiki Documents which describe the code and aspects of it in more detail
 
 
-.. _trepan: https://pypi.python.org/pypi/trepan2g
+.. _trepan: https://pypi.python.org/pypi/trepan2
 .. _compiler: https://pypi.python.org/pypi/spark_parser
 .. _HISTORY: https://github.com/rocky/python-uncompyle6/blob/master/HISTORY.md
 .. _debuggers: https://pypi.python.org/pypi/trepan3k
@@ -236,11 +231,6 @@ See Also
 .. _this: https://github.com/rocky/python-uncompyle6/wiki/Deparsing-technology-and-its-use-in-exact-location-reporting
 .. |buildstatus| image:: https://travis-ci.org/rocky/python-uncompyle6.svg
 		 :target: https://travis-ci.org/rocky/python-uncompyle6
-.. |packagestatus| image:: https://repology.org/badge/vertical-allrepos/python:uncompyle6.svg
-		 :target: https://repology.org/project/python:uncompyle6/versions
 .. _PJOrion: http://www.koreanrandom.com/forum/topic/15280-pjorion-%D1%80%D0%B5%D0%B4%D0%B0%D0%BA%D1%82%D0%B8%D1%80%D0%BE%D0%B2%D0%B0%D0%BD%D0%B8%D0%B5-%D0%BA%D0%BE%D0%BC%D0%BF%D0%B8%D0%BB%D1%8F%D1%86%D0%B8%D1%8F-%D0%B4%D0%B5%D0%BA%D0%BE%D0%BC%D0%BF%D0%B8%D0%BB%D1%8F%D1%86%D0%B8%D1%8F-%D0%BE%D0%B1%D1%84
 .. _Deobfuscator: https://github.com/extremecoders-re/PjOrion-Deobfuscator
 .. _Py2EXE: https://en.wikipedia.org/wiki/Py2exe
-.. |Supported Python Versions| image:: https://img.shields.io/pypi/pyversions/uncompyle6.svg
-.. |Latest Version| image:: https://badge.fury.io/py/uncompyle6.svg
-		 :target: https://badge.fury.io/py/uncompyle6

__pkginfo__.py

@@ -23,49 +23,46 @@
 
 # Things that change more often go here.
 copyright   = """
-Copyright (C) 2015-2019 Rocky Bernstein <rb@dustyfeet.com>.
+Copyright (C) 2015-2018 Rocky Bernstein <rb@dustyfeet.com>.
 """
 
-classifiers =  ["Development Status :: 5 - Production/Stable",
-                "Intended Audience :: Developers",
-                "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-                "Operating System :: OS Independent",
-                "Programming Language :: Python",
-                "Programming Language :: Python :: 2.4",
-                "Programming Language :: Python :: 2.5",
-                "Programming Language :: Python :: 2.6",
-                "Programming Language :: Python :: 2.7",
-                "Programming Language :: Python :: 3.0",
-                "Programming Language :: Python :: 3.1",
-                "Programming Language :: Python :: 3.2",
-                "Programming Language :: Python :: 3.3",
-                "Programming Language :: Python :: 3.4",
-                "Programming Language :: Python :: 3.5",
-                "Programming Language :: Python :: 3.6",
-                "Programming Language :: Python :: 3.7",
-                "Programming Language :: Python :: 3.8",
-                "Topic :: Software Development :: Debuggers",
-                "Topic :: Software Development :: Libraries :: Python Modules",
+classifiers =  ['Development Status :: 5 - Production/Stable',
+                'Intended Audience :: Developers',
+                'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
+                'Operating System :: OS Independent',
+                'Programming Language :: Python',
+                'Programming Language :: Python :: 2.4',
+                'Programming Language :: Python :: 2.5',
+                'Programming Language :: Python :: 2.6',
+                'Programming Language :: Python :: 2.7',
+                'Programming Language :: Python :: 3.1',
+                'Programming Language :: Python :: 3.2',
+                'Programming Language :: Python :: 3.3',
+                'Programming Language :: Python :: 3.4',
+                'Programming Language :: Python :: 3.5',
+                'Programming Language :: Python :: 3.6',
+                'Programming Language :: Python :: 3.7',
+                'Topic :: Software Development :: Debuggers',
+                'Topic :: Software Development :: Libraries :: Python Modules',
                 ]
 
 # The rest in alphabetic order
 author             = "Rocky Bernstein, Hartmut Goebel, John Aycock, and others"
 author_email       = "rb@dustyfeet.com"
 entry_points       = {
-    "console_scripts": [
-        "uncompyle6=uncompyle6.bin.uncompile:main_bin",
-        "pydisassemble=uncompyle6.bin.pydisassemble:main",
+    'console_scripts': [
+        'uncompyle6=uncompyle6.bin.uncompile:main_bin',
+        'pydisassemble=uncompyle6.bin.pydisassemble:main',
     ]}
 ftp_url            = None
-install_requires   = ["spark-parser >= 1.8.9, < 1.9.0",
-                      "xdis >= 4.0.3, < 4.1.0"]
-
-license            = "GPL3"
-mailing_list       = "python-debugger@googlegroups.com"
-modname            = "uncompyle6"
+install_requires   = ['spark-parser >= 1.8.5, < 1.9.0',
+                      'xdis >= 3.8.2, < 3.9.0']
+license            = 'GPL3'
+mailing_list       = 'python-debugger@googlegroups.com'
+modname            = 'uncompyle6'
 py_modules         = None
-short_desc         = "Python cross-version byte-code decompiler"
-web                = "https://github.com/rocky/python-uncompyle6/"
+short_desc         = 'Python cross-version byte-code decompiler'
+web                = 'https://github.com/rocky/python-uncompyle6/'
 
 # tracebacks in zip files are funky and not debuggable
 zip_safe = True
@@ -82,5 +79,5 @@ def read(*rnames):
     return open(os.path.join(srcdir, *rnames)).read()
 
 # Get info from files; set: long_description and VERSION
-long_description   = ( read("README.rst") + "\n" )
-exec(read("uncompyle6/version.py"))
+long_description   = ( read("README.rst") + '\n' )
+exec(read('uncompyle6/version.py'))

admin-tools/check-newer-versions.sh

@@ -16,7 +16,6 @@ if ! source ./setup-master.sh ; then
 fi
 cd ..
 for version in $PYVERSIONS; do
-    echo --- $version ---
     if ! pyenv local $version ; then
 	exit $?
     fi
@@ -24,5 +23,4 @@ for version in $PYVERSIONS; do
     if ! make check; then
 	exit $?
     fi
-    echo === $version ===
 done

admin-tools/check-older-versions.sh

@@ -15,7 +15,6 @@ fi
 
 cd ..
 for version in $PYVERSIONS; do
-    echo --- $version ---
     if ! pyenv local $version ; then
 	exit $?
     fi
@@ -23,5 +22,4 @@ for version in $PYVERSIONS; do
     if ! make check ; then
 	exit $?
     fi
-    echo === $version ===
 done

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

@@ -30,9 +30,9 @@
 
     $ make ChangeLog
 
-#  Update NEWS.md from ChangeLog:
+#  Update NEWS from ChangeLog:
 
-    $ emacs NEWS.md
+    $ emacs NEWS
     $ make check
     $ git commit --amend .
     $ git push   # get CI testing going early
@@ -58,8 +58,7 @@
     $ git tag release-python-2.4-$VERSION
 
     $ . ./admin-tools/make-dist-newer.sh
-
-Goto https://github.com/rocky/python-uncompyle6/releases
+    $ git tag release-$VERSION
 
 # Upload single package and look at Rst Formating
 

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

@@ -0,0 +1,46 @@
+git pull
+
+Change version in 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
+make check
+
+git commit --amend .
+
+git push
+
+Make sure pyenv is running
+# Pyenv
+
+source admin-tools/check-newer-versions.sh
+
+
+# Switch to python-2.4 and build that first...
+source admin-tools/setup-python-2.4
+
+rm ChangeLog
+git merge master
+
+Update NEWS from master branch
+
+git commit -m"Get ready for release $VERSION" .
+
+source admin-tools/check-older-versions.sh
+source admin-tools/check-newer-versions.sh
+
+make-dist-older.sh
+
+git tag release-python-2.4-$VERSION
+
+./make-dist-newer.sh
+
+git tag release-$VERSION
+
+
+twine upload dist/uncompyle6-${VERSION}*

admin-tools/pyenv-newer-versions

@@ -5,4 +5,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
     echo "This script should be *sourced* rather than run directly through bash"
     exit 1
 fi
-export PYVERSIONS='3.6.8 3.7.3 2.6.9 3.3.7 2.7.16 3.2.6 3.1.5 3.4.8'
+export PYVERSIONS='3.5.5 3.6.5 2.6.9 3.3.7 2.7.14 3.2.6 3.1.5 3.4.8'

admin-tools/pyenv-older-versions

@@ -6,4 +6,4 @@ 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 2.6.9'
+export PYVERSIONS='2.4.6 2.5.6'

admin-tools/setup-master.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-PYTHON_VERSION=3.6.8
+PYTHON_VERSION=3.6.5
 
 # FIXME put some of the below in a common routine
 function finish {

admin-tools/update-sources.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+cd $(dirname ${BASH_SOURCE[0]})/..
+git pull

appveyor.yml

@@ -47,7 +47,7 @@ install:
 
   # Upgrade to the latest version of pip to avoid it displaying warnings
   # about it being out of date.
-  - "%PYTHON%\\python.exe -m pip install --disable-pip-version-check --user --upgrade pip"
+  - "pip install --disable-pip-version-check --user --upgrade pip"
 
   # Install the build dependencies of the project. If some dependencies contain
   # compiled extensions and are not provided as pre-built wheel packages,
@@ -61,7 +61,7 @@ build_script:
 
 test_script:
   # Run the project tests
-  - "%CMD_IN_ENV% python test/test_pyenvlib.py --native --syntax-verify"
+  - "%CMD_IN_ENV% python test/test_pyenvlib.py --native --weak-verify"
 
 after_test:
   # If tests are successful, create binary packages for the project.

circle.yml

@@ -0,0 +1,15 @@
+machine:
+    python:
+        version: 2.7.10
+    environment:
+        COMPILE: --compile
+
+dependencies:
+    override:
+        - pip install --upgrade setuptools
+        - pip install -e .
+        - pip install pytest==3.2.5 hypothesis
+test:
+    override:
+        - python ./setup.py develop && make check-2.7
+        - cd ./test/stdlib && pyenv local 2.7.10 && bash ./runtests.sh 'test_[f-i]*.py'

pytest/test_deparse.py

@@ -30,7 +30,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(code, version=PYTHON_VERSION)
 
 def check_expect(expect, parsed, fn_name):

pytest/test_docstring.py

@@ -0,0 +1,78 @@
+import sys
+from uncompyle6 import PYTHON3
+if PYTHON3:
+    from io import StringIO
+    minint = -sys.maxsize-1
+    maxint = sys.maxsize
+else:
+    from StringIO import StringIO
+    minint = -sys.maxint-1
+    maxint = sys.maxint
+from uncompyle6.semantics.helper import print_docstring
+
+class PrintFake:
+    def __init__(self):
+        self.pending_newlines = 0
+        self.f = StringIO()
+
+    def write(self, *data):
+        if (len(data) == 0) or (len(data) == 1 and data[0] == ''):
+            return
+        out = ''.join((str(j) for j in data))
+        n = 0
+        for i in out:
+            if i == '\n':
+                n += 1
+                if n == len(out):
+                    self.pending_newlines = max(self.pending_newlines, n)
+                    return
+            elif n:
+                self.pending_newlines = max(self.pending_newlines, n)
+                out = out[n:]
+                break
+            else:
+                break
+
+        if self.pending_newlines > 0:
+            self.f.write('\n'*self.pending_newlines)
+            self.pending_newlines = 0
+
+        for i in out[::-1]:
+            if i == '\n':
+                self.pending_newlines += 1
+            else:
+                break
+
+        if self.pending_newlines:
+            out = out[:-self.pending_newlines]
+        self.f.write(out)
+    def println(self, *data):
+        if data and not(len(data) == 1 and data[0] ==''):
+            self.write(*data)
+        self.pending_newlines = max(self.pending_newlines, 1)
+        return
+    pass
+
+def test_docstring():
+
+    for doc, expect in (
+            ("Now is the time",
+             '  """Now is the time"""'),
+           ("""
+Now is the time
+""",
+            '''  """
+  Now is the time
+  """''')
+
+            # (r'''func placeholder - ' and with ("""\nstring\n  """)''',
+            #  """  r'''func placeholder - ' and with (\"\"\"\nstring\n\"\"\")'''"""),
+            # (r"""func placeholder - ' and with ('''\nstring\n''') and \"\"\"\nstring\n\"\"\" """,
+            # """  r\"\"\"func placeholder - ' and with ('''\nstring\n''') and \"\"\"\nstring\n\"\"\" \"\"\"""")
+            ):
+
+        o = PrintFake()
+        # print(doc)
+        # print(expect)
+        print_docstring(o, '  ', doc)
+        assert expect == o.f.getvalue()

pytest/test_fjt.py

@@ -20,7 +20,7 @@ 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)
     if 2.7 <= PYTHON_VERSION <= 3.0 and not IS_PYPY:
         scan.build_instructions(code)

pytest/test_fstring.py

@@ -1,158 +0,0 @@
-# std
-# test
-import sys
-from uncompyle6 import PYTHON_VERSION, code_deparse
-import pytest
-
-pytestmark = pytest.mark.skipif(
-    PYTHON_VERSION <= 2.6, reason="hypothesis needs 2.7 or later"
-)
-if PYTHON_VERSION > 2.6:
-
-    import hypothesis
-    from hypothesis import strategies as st
-
-    # uncompyle6
-
-    @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 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 = code_deparse(code, sys.stdout, PYTHON_VERSION, compile_mode="single")
-        recompiled = compile(deparsed.text, "<string>", "single")
-        if recompiled != code:
-            print(recompiled)
-            print("================")
-            print(code)
-            print("----------------")
-            assert (
-                "dis(" + deparsed.text.strip("\n") + ")"
-                == "dis(" + expr.strip("\n") + ")"
-            )
-
-    @pytest.mark.skipif(PYTHON_VERSION != 3.6, reason="need 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 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,185 +0,0 @@
-import string
-from uncompyle6 import PYTHON_VERSION
-import pytest
-pytestmark = pytest.mark.skip(PYTHON_VERSION < 2.7,
-                              reason="need at least Python 2.7")
-
-if PYTHON_VERSION > 2.6:
-    from hypothesis import given, assume, example, settings, strategies as st
-    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()")
-
-    @pytest.mark.skipif(PYTHON_VERSION < 2.7,
-                        reason="need at least Python 2.7")
-    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):
-
-        @pytest.mark.skipif(PYTHON_VERSION < 2.7,
-                            reason="need at least Python 2.7")
-        @given(isolated_function_calls('positional'))
-        @example("fn(0)")
-        def test_function_positional_only(expr):
-            validate_uncompyle(expr)
-
-        @pytest.mark.skipif(PYTHON_VERSION < 2.7,
-                            reason="need at least Python 2.7")
-        @given(isolated_function_calls('keyword'))
-        @example("fn(a=0)")
-        def test_function_call_keyword_only(expr):
-            validate_uncompyle(expr)
-
-        @pytest.mark.skipif(PYTHON_VERSION < 2.7,
-                            reason="need at least Python 2.7")
-        @given(isolated_function_calls('star'))
-        @example("fn(*items)")
-        def test_function_call_star_only(expr):
-            validate_uncompyle(expr)
-
-        @pytest.mark.skipif(PYTHON_VERSION < 2.7,
-                            reason="need at least Python 2.7")
-        @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

@@ -7,9 +7,8 @@ def test_grammar():
 
     def check_tokens(tokens, opcode_set):
         remain_tokens = set(tokens) - opcode_set
-        remain_tokens = set([re.sub(r'_\d+$','', t) for t in remain_tokens])
+        remain_tokens = set([re.sub('_\d+$','', t) for t in remain_tokens])
         remain_tokens = set([re.sub('_CONT$','', t) for t in remain_tokens])
-        remain_tokens = set([re.sub('LOAD_CODE$','', 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())
@@ -19,19 +18,15 @@ def test_grammar():
      right_recursive, dup_rhs) = p.check_sets()
 
     # We have custom rules that create the below
-    expect_lhs = set(['pos_arg', 'attribute'])
-    if PYTHON_VERSION < 3.8:
-        expect_lhs.add('get_iter')
-
+    expect_lhs = set(['pos_arg', 'get_iter', 'attribute'])
 
     unused_rhs = set(['list', 'mkfunc',
                       'mklambda',
                       'unpack',])
-
     expect_right_recursive = set([('designList',
                                    ('store', 'DUP_TOP', 'designList'))])
 
-    if PYTHON_VERSION < 3.7:
+    if PYTHON_VERSION != 3.7:
         unused_rhs.add('call')
 
     if PYTHON_VERSION > 2.6:
@@ -51,12 +46,13 @@ def test_grammar():
             unused_rhs.add("mkfunc_annotate")
             unused_rhs.add("dict_comp")
             unused_rhs.add("classdefdeco1")
-            unused_rhs.add("tryelsestmtl")
-            if PYTHON_VERSION >= 3.5:
-                expect_right_recursive.add((('l_stmts',
-                                             ('lastl_stmt', 'come_froms', 'l_stmts'))))
+            if PYTHON_VERSION != 3.6:
+                if PYTHON_VERSION in (3.5, 3.7):
+                    expect_right_recursive.add((('l_stmts',
+                                                 ('lastl_stmt', 'come_froms', 'l_stmts'))))
+                    pass
                 pass
-            elif 3.0 < PYTHON_VERSION < 3.3:
+            else:
                 expect_right_recursive.add((('l_stmts',
                                              ('lastl_stmt', 'COME_FROM', 'l_stmts'))))
                 pass
@@ -66,11 +62,7 @@ def test_grammar():
         expect_lhs.add('kwarg')
 
     assert expect_lhs == set(lhs)
-
-    # FIXME
-    if PYTHON_VERSION != 3.8:
-        assert unused_rhs == set(rhs)
-
+    assert unused_rhs == set(rhs)
     assert expect_right_recursive == right_recursive
 
     expect_dup_rhs = frozenset([('COME_FROM',), ('CONTINUE',), ('JUMP_ABSOLUTE',),
@@ -89,7 +81,7 @@ def test_grammar():
             COME_FROM_EXCEPT_CLAUSE
             COME_FROM_LOOP COME_FROM_WITH
             COME_FROM_FINALLY ELSE
-            LOAD_GENEXPR LOAD_ASSERT LOAD_SETCOMP LOAD_DICTCOMP LOAD_STR LOAD_CODE
+            LOAD_GENEXPR LOAD_ASSERT LOAD_SETCOMP LOAD_DICTCOMP
             LAMBDA_MARKER
             RETURN_END_IF RETURN_END_IF_LAMBDA RETURN_VALUE_LAMBDA RETURN_LAST
             """.split())

pytest/test_pysource.py

@@ -8,14 +8,10 @@ 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, deparse_code2str)
+from uncompyle6.semantics.pysource import SourceWalker as SourceWalker
 
 def test_template_engine():
     s = StringIO()
@@ -30,7 +26,7 @@ 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 (
@@ -44,7 +40,7 @@ def test_tables():
             (TABLE_DIRECT, 'TABLE_DIRECT', False),
             (TABLE_R, 'TABLE_R', False),
             (TABLE_DIRECT_FRAGMENT, 'TABLE_DIRECT_FRAGMENT', True)):
-        for k, entry in iteritems(t):
+        for k, entry in t.iteritems():
             if k in skip_for_now:
                 continue
             fmt = entry[0]
@@ -127,17 +123,11 @@ def test_tables():
                             "Full entry: %s" %
                             (name, k, arg, typ, entry[arg], type(entry[arg]), entry)
                             )
-                        assert 2 <= len(tup) <= 3
+                        assert len(tup) == 2
                         for j, x in enumerate(tup):
-                            if len(tup) == 3 and j == 1:
-                                assert isinstance(x, str), (
-                                    "%s[%s][%d][%d] type '%s' is '%s should be an string but is %s. Full entry: %s" %
-                                    (name, k, arg, j, typ, x, type(x), entry)
-                                    )
-                            else:
-                                assert isinstance(x, int), (
-                                    "%s[%s][%d][%d] type '%s' is '%s should be an int but is %s. Full entry: %s" %
-                                    (name, k, arg, j, typ, x, type(x), entry)
+                            assert isinstance(x, int), (
+                                "%s[%s][%d][%d] type '%s' is '%s should be an int but is %s. Full entry: %s" %
+                                (name, k, arg, j, typ, x, type(x), entry)
                                 )
                         pass
                     arg += 1
@@ -185,11 +175,3 @@ def test_tables():
             assert arg == len(entry), (
                 "%s[%s] arg %d should be length of entry %d. Full entry: %s" %
                             (name, k, arg, len(entry), entry))
-
-def test_deparse_code2str():
-    def deparse_test(co):
-        "This is a docstring"
-        s = deparse_code2str(co, debug_opts={"asm": "after", "tree": True})
-        assert s
-        return
-    deparse_test(deparse_test.__code__)

pytest/test_single_compile.py

@@ -1,9 +1,6 @@
-import pytest
-from uncompyle6 import PYTHON_VERSION, code_deparse
-pytestmark = pytest.mark.skip(PYTHON_VERSION < 2.7,
-                              reason="need at least Python 2.7")
+from uncompyle6 import PYTHON_VERSION, deparse_code
 
-if PYTHON_VERSION > 2.6:
+if PYTHON_VERSION >= 2.6:
     def test_single_mode():
         single_expressions = (
             'i = 1',
@@ -19,4 +16,4 @@ if PYTHON_VERSION > 2.6:
 
         for expr in single_expressions:
             code = compile(expr + '\n', '<string>', 'single')
-            assert code_deparse(code, compile_mode='single').text == expr + '\n'
+            assert deparse_code(PYTHON_VERSION, code, compile_mode='single').text == expr + '\n'

pytest/test_token.py

@@ -1,4 +1,3 @@
-from uncompyle6 import PYTHON_VERSION
 from uncompyle6.scanners.tok import Token
 
 def test_token():
@@ -17,7 +16,7 @@ def test_token():
     # Make sure formatting of: LOAD_CONST False. We assume False is the 0th index
     # of co_consts.
     t = Token('LOAD_CONST', offset=1, attr=False, pattr=False, has_arg=True)
-    expect = '           1  LOAD_CONST               False'
+    expect = '           1  LOAD_CONST            0  False'
     assert t.format() == expect
 
 if __name__ == '__main__':

pytest/testdata/if-2.7.right

@@ -8,5 +8,5 @@
            9  STORE_NAME            2  'b'
           12  JUMP_FORWARD          0  'to 15'
         15_0  COME_FROM            12  '12'
-          15  LOAD_CONST               None
-          18  RETURN_VALUE     
+          15  LOAD_CONST            0  None
+          18  RETURN_VALUE

pytest/testdata/ifelse-2.7.right

@@ -4,12 +4,12 @@
    3       0  LOAD_NAME             0  'True'
            3  POP_JUMP_IF_FALSE    15  'to 15'
 
-   4       6  LOAD_CONST               1
+   4       6  LOAD_CONST            0  1
            9  STORE_NAME            1  'b'
           12  JUMP_FORWARD          6  'to 21'
 
-   6      15  LOAD_CONST               2
+   6      15  LOAD_CONST            1  2
           18  STORE_NAME            2  'd'
         21_0  COME_FROM            12  '12'
-          21  LOAD_CONST               None
-          24  RETURN_VALUE     
+          21  LOAD_CONST            2  None
+          24  RETURN_VALUE

pytest/validate.py

@@ -1,33 +1,26 @@
-# future
-from __future__ import print_function
-
 # std
 import os
 import difflib
 import subprocess
 import tempfile
-import functools
 
+from StringIO import StringIO
 # uncompyle6 / xdis
-from uncompyle6 import PYTHON_VERSION, PYTHON3, IS_PYPY, code_deparse
-
+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)
-import six
 
-if PYTHON3:
-    from io import StringIO
-else:
-    from StringIO import StringIO
+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):
     """
@@ -38,34 +31,40 @@ def print_diff(original, uncompyled):
     :param original: Text describing the original code object.
     :param uncompyled: Text describing the uncompyled code object.
     """
-    original_lines = original.split("\n")
-    uncompyled_lines = uncompyled.split("\n")
-    args = original_lines, uncompyled_lines, "original", "uncompyled"
+    original_lines = original.split('\n')
+    uncompyled_lines = uncompyled.split('\n')
+    args = original_lines, uncompyled_lines, 'original', 'uncompyled'
     try:
         from bs4 import BeautifulSoup
-
         diff = difflib.HtmlDiff().make_file(*args)
         diff = BeautifulSoup(diff, "html.parser")
         diff.select_one('table[summary="Legends"]').extract()
     except ImportError:
-        print("\nTo display diff highlighting run:\n    pip install BeautifulSoup4")
+        print('\nTo display diff highlighting run:\n    pip install BeautifulSoup4')
         diff = difflib.HtmlDiff().make_table(*args)
 
-    with tempfile.NamedTemporaryFile(delete=False) as f:
-        f.write(str(diff).encode("utf-8"))
+    f = tempfile.NamedTemporaryFile(delete=False)
+    try:
+        f.write(str(diff).encode('utf-8'))
+    finally:
+        f.close()
 
     try:
         print()
-        html = subprocess.check_output(
-            ["elinks", "-dump", "-no-references", "-dump-color-mode", "1", f.name]
-        ).decode("utf-8")
+        html = subprocess.check_output([
+            'elinks',
+            '-dump',
+            '-no-references',
+            '-dump-color-mode',
+            '1',
+            f.name,
+        ]).decode('utf-8')
         print(html)
     except:
-        print("\nFor side by side diff install elinks")
+        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)
+        print('\n'.join(diff))
+    os.unlink(f.name)
 
 
 def are_instructions_equal(i1, i2):
@@ -81,19 +80,18 @@ def are_instructions_equal(i1, i2):
 
     :return: True if the two instructions are approximately equal, otherwise False.
     """
-    result = (
-        1 == 1
+    result = (1==1
         and i1.opname == i2.opname
         and i1.opcode == i2.opcode
         and i1.arg == i2.arg
         # ignore differences due to code objects
         # TODO : Better way of ignoring address
-        and (i1.argval == i2.argval or "<code object" in str(i1.argval))
+        and (i1.argval == i2.argval or '<code object' in str(i1.argval))
         # TODO : Should probably recurse to check code objects
-        and (i1.argrepr == i2.argrepr or "<code object" in i1.argrepr)
+        and (i1.argrepr == i2.argrepr or '<code object' in i1.argrepr)
         and i1.offset == i2.offset
         # ignore differences in line numbers
-        # and i1.starts_line
+        #and i1.starts_line
         and i1.is_jump_target == i2.is_jump_target
     )
     return result
@@ -117,21 +115,23 @@ def are_code_objects_equal(co1, co2):
     return True
 
 
-def validate_uncompyle(text, mode="exec"):
+def validate_uncompyle(text, mode='exec'):
     """
     Validate decompilation of the given source code.
 
     :param text: Source to validate decompilation of.
     """
-    original_code = compile(text, "<string>", mode)
+    original_code = compile(text, '<string>', mode)
     original_dis = _dis_to_text(original_code)
     original_text = text
 
-    deparsed = code_deparse(
-        original_code, out=six.StringIO(), version=PYTHON_VERSION, compile_mode=mode
-    )
+    deparsed = deparse_code(PYTHON_VERSION, original_code,
+
+                            compile_mode=mode,
+                            out=StringIO(),
+                            is_pypy=IS_PYPY)
     uncompyled_text = deparsed.text
-    uncompyled_code = compile(uncompyled_text, "<string>", "exec")
+    uncompyled_code = compile(uncompyled_text, '<string>', 'exec')
 
     if not are_code_objects_equal(uncompyled_code, original_code):
 
@@ -139,17 +139,15 @@ def validate_uncompyle(text, mode="exec"):
 
         def output(text, dis):
             width = 60
-            return "\n\n".join(
-                [
-                    " SOURCE CODE ".center(width, "#"),
-                    text.strip(),
-                    " BYTECODE ".center(width, "#"),
-                    dis,
-                ]
-            )
+            return '\n\n'.join([
+                ' SOURCE CODE '.center(width, '#'),
+                text.strip(),
+                ' BYTECODE '.center(width, '#'),
+                dis
+            ])
 
         original = output(original_text, original_dis)
         uncompyled = output(uncompyled_text, uncompyled_dis)
         print_diff(original, uncompyled)
 
-        assert "original" == "uncompyled"
+        assert 'original' == 'uncompyled'

requirements-dev.txt

@@ -1,4 +1,3 @@
+pytest>=3.0.0,<=3.0.1
 flake8
 hypothesis<=3.0.0
-six
-pytest==3.2.5

requirements.txt

@@ -1,4 +1,2 @@
 # Pick up stuff from setup.py
-hypothesis==2.0.0
-pytest
 -e .

setup.cfg

@@ -1,6 +1,6 @@
 [bdist_rpm]
 release = 1
-packager = rocky <rb@dustyfeet.com>
+packager = Mysterie <kajusska@gmail.com>
 doc_files = README
 #		CHANGES.txt
 #		USAGE.txt
@@ -8,4 +8,4 @@ doc_files = README
 #		examples/
 
 [bdist_wheel]
-# universal=1
+universal=1

setup.py

@@ -1,16 +1,16 @@
 #!/usr/bin/env python
-import sys
-
 """Setup script for the 'uncompyle6' distribution."""
 
+import sys
+
 SYS_VERSION = sys.version_info[0:2]
-if not ((2, 6) <= SYS_VERSION  <= (3, 8)):
-    mess = "Python Release 2.6 .. 3.8 are supported in this code branch."
-    if ((2, 4) <= SYS_VERSION <= (2, 7)):
-        mess += ("\nFor your Python, version %s, use the python-2.4 code/branch." %
+if not ((2, 4) <= SYS_VERSION  <= (2, 7)):
+    mess = "Python Release 2.4 .. 2.7 are supported in this code branch."
+    if ((3, 2) <= SYS_VERSION  <= (3, 7)):
+        mess += ("\nFor your Python, version %s, use the master code/branch." %
                  sys.version[0:3])
-    elif SYS_VERSION < (2, 4):
-        mess += ("\nThis package is not supported for Python version %s."
+    else:
+        mess += ("\nThis package is not supported before Python 2.4. Your Python version is %s."
                  % sys.version[0:3])
     print(mess)
     raise Exception(mess)

test-unit/test_grammar.py

@@ -0,0 +1,55 @@
+import re
+import unittest
+from uncompyle6 import PYTHON_VERSION, IS_PYPY # , PYTHON_VERSION
+from uncompyle6.parser import get_python_parser, python_parser
+
+class TestGrammar(unittest.TestCase):
+    def test_grammar(self):
+
+        def check_tokens(tokens, opcode_set):
+            remain_tokens = set(tokens) - opcode_set
+            remain_tokens = set([re.sub('_\d+$','', t) for t in remain_tokens])
+            remain_tokens = set([re.sub('_CONT$','', t) for t in remain_tokens])
+            remain_tokens = set(remain_tokens) - opcode_set
+            self.assertEqual(remain_tokens, set([]),
+                    "Remaining tokens %s\n====\n%s" % (remain_tokens, p.dump_grammar()))
+
+        p = get_python_parser(PYTHON_VERSION, is_pypy=IS_PYPY)
+        (lhs, rhs, tokens,
+         right_recursive, dup_rhs) = p.check_sets()
+        expect_lhs = set(['expr1024', 'pos_arg'])
+        unused_rhs = set(['list', 'call', 'mkfunc',
+                          'mklambda',
+                          'unpack',])
+
+        expect_right_recursive = frozenset([('designList',
+                                             ('store', 'DUP_TOP', 'designList'))])
+        expect_lhs.add('kwarg')
+
+        self.assertEqual(expect_lhs, set(lhs))
+        self.assertEqual(unused_rhs, set(rhs))
+        self.assertEqual(expect_right_recursive, right_recursive)
+
+        expect_dup_rhs = frozenset([('COME_FROM',), ('CONTINUE',), ('JUMP_ABSOLUTE',),
+                                    ('LOAD_CONST',),
+                                    ('JUMP_BACK',), ('JUMP_FORWARD',)])
+
+        reduced_dup_rhs = {}
+        for k in dup_rhs:
+            if k not in expect_dup_rhs:
+                reduced_dup_rhs[k] = dup_rhs[k]
+                pass
+            pass
+        for k in reduced_dup_rhs:
+            print(k, reduced_dup_rhs[k])
+        # assert not reduced_dup_rhs, reduced_dup_rhs
+
+    def test_dup_rule(self):
+        import inspect
+        python_parser(PYTHON_VERSION, inspect.currentframe().f_code,
+                      is_pypy=IS_PYPY,
+                      parser_debug={
+                          'dups': True, 'transition': False, 'reduce': False,
+                          'rules': False, 'errorstack': None, 'context': True})
+if __name__ == '__main__':
+    unittest.main()

test/Makefile

@@ -1,6 +1,6 @@
 PHONY=check clean dist distclean test test-unit test-functional rmChangeLog clean_pyc nosetests \
-      check-bytecode-1  check-bytecode-1.3 check-bytecode-1.4 check-bytecode-1.5 \
-      check-bytecode-2 check-bytecode-3 check-bytecode-3-short \
+      check-bytecode-1  check-bytecode-1.4 check-bytecode-1.5 \
+      check-bytecode-2 check-bytecode-3 \
       check-bytecode-2.2 check-byteocde-2.3 check-bytecode-2.4 \
       check-short check-2.6 check-2.7 check-3.0 check-3.1 check-3.2 check-3.3 \
       check-3.4 check-3.5 check-3.6 check-3.7 check-5.6 5.6 5.8 \
@@ -22,59 +22,51 @@ COVER_DIR=../tmp/grammar-cover
 # Run short tests
 check-short:
 	@$(PYTHON) -V && PYTHON_VERSION=`$(PYTHON) -V 2>&1 | cut -d ' ' -f 2 | cut -d'.' -f1,2`; \
-	$(MAKE) check-bytecode-short
+	$(MAKE) check-bytecode
 
 # Run all tests
 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
-	$(PYTHON) test_pythonlib.py --bytecode-3.0-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.0 --syntax-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --bytecode-3.0 --weak-verify $(COMPILE)
 
 #: Run working tests from Python 3.1
 check-3.1: check-bytecode
+	$(PYTHON) test_pythonlib.py --bytecode-3.1 --weak-verify $(COMPILE)
 	$(PYTHON) test_pythonlib.py --bytecode-3.1-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.1 --syntax-verify $(COMPILE)
 
 #: Run working tests from Python 3.2
 check-3.2: check-bytecode
+	$(PYTHON) test_pythonlib.py --bytecode-3.2 --weak-verify $(COMPILE)
 	$(PYTHON) test_pythonlib.py --bytecode-3.2-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.2 --syntax-verify $(COMPILE)
 
 #: Run working tests from Python 3.3
 check-3.3: check-bytecode
+	$(PYTHON) test_pythonlib.py --bytecode-3.3 --weak-verify $(COMPILE)
 	$(PYTHON) test_pythonlib.py --bytecode-3.3-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.3 --syntax-verify $(COMPILE)
 
 #: Run working tests from Python 3.4
 check-3.4: check-bytecode check-3.4-ok check-2.7-ok
+	$(PYTHON) test_pythonlib.py --bytecode-3.4 --weak-verify $(COMPILE)
 	$(PYTHON) test_pythonlib.py --bytecode-3.4-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.4 --syntax-verify $(COMPILE)
 
 #: Run working tests from Python 3.5
 check-3.5: check-bytecode
+	$(PYTHON) test_pythonlib.py --bytecode-3.5 --weak-verify $(COMPILE)
 	$(PYTHON) test_pythonlib.py --bytecode-3.5-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.5 --syntax-verify $(COMPILE)
 
 #: Run working tests from Python 3.6
 check-3.6: check-bytecode
-	$(PYTHON) test_pythonlib.py --bytecode-3.6-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.6 --syntax-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --bytecode-3.6 --weak-verify $(COMPILE)
 
 #: Run working tests from Python 3.7
 check-3.7: check-bytecode
-	$(PYTHON) test_pythonlib.py --bytecode-3.7-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.7 --syntax-verify $(COMPILE)
-
-#: Run working tests from Python 3.8
-check-3.8: check-bytecode
-	$(PYTHON) test_pythonlib.py --bytecode-3.8-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.8 --syntax-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --bytecode-3.7 --weak-verify $(COMPILE)
 
 # FIXME
 #: this is called when running under pypy3.5-5.8.0 or pypy2-5.6.0
@@ -96,36 +88,19 @@ check-bytecode-2:
 #: Check deparsing bytecode 3.x only
 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-3.6 \
-        --bytecode-3.7 --bytecode-3.8 \
-	--bytecode-pypy3.2
+       --bytecode-3.1 --bytecode-3.2 --bytecode-3.3 \
+       --bytecode-3.4 --bytecode-3.5 --bytecode-3.6 --bytecode-pypy3.2
 
-#: Check deparsing on selected bytecode 3.x
-check-bytecode-3-short:
-	$(PYTHON) test_pythonlib.py \
-       --bytecode-3.4 --bytecode-3.5 --bytecode-3.6
-
-#: Check deparsing bytecode on all Python 2 and Python 3 versions
+#: Check deparsing bytecode that works running Python 2 and Python 3
 check-bytecode: check-bytecode-3
 	$(PYTHON) test_pythonlib.py \
-	--bytecode-1.3 --bytecode-1.4 --bytecode-1.5 \
+	--bytecode-1.4 --bytecode-1.5 \
         --bytecode-2.2 --bytecode-2.3 --bytecode-2.4 \
 	--bytecode-2.1 --bytecode-2.2 --bytecode-2.3 --bytecode-2.4 \
         --bytecode-2.5 --bytecode-2.6 --bytecode-2.7 \
         --bytecode-pypy2.7
 
 
-#: Check deparsing bytecode on selected Python 2 and Python 3 versions
-check-bytecode-short: check-bytecode-3-short
-	$(PYTHON) test_pythonlib.py \
-        --bytecode-2.6 --bytecode-2.7 --bytecode-pypy2.7
-
-
-#: Check deparsing bytecode 1.3 only
-check-bytecode-1.3:
-	$(PYTHON) test_pythonlib.py --bytecode-1.3
-
 #: Check deparsing bytecode 1.4 only
 check-bytecode-1.4:
 	$(PYTHON) test_pythonlib.py --bytecode-1.4
@@ -176,7 +151,7 @@ grammar-coverage-2.6:
 grammar-coverage-2.7:
 	-rm $(COVER_DIR)/spark-grammar-2.7.cover || true
 	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-2.7.cover $(PYTHON) test_pythonlib.py --bytecode-2.7
-	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-2.7.cover $(PYTHON) test_pyenvlib.py --2.7.16 --max=600
+	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-2.7.cover $(PYTHON) test_pyenvlib.py --2.7.14 --max=600
 
 #: Get grammar coverage for Python 3.0
 grammar-coverage-3.0:
@@ -219,107 +194,93 @@ grammar-coverage-3.5:
 grammar-coverage-3.6:
 	rm $(COVER_DIR)/spark-grammar-3.6.cover || /bin/true
 	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-3.6.cover $(PYTHON) test_pythonlib.py --bytecode-3.6
-	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-3.6.cover $(PYTHON) test_pyenvlib.py --3.6.8 --max=280
-
-#: Get grammar coverage for Python 3.7
-grammar-coverage-3.7:
-	rm $(COVER_DIR)/spark-grammar-3.7.cover || /bin/true
-	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-3.7.cover $(PYTHON) test_pyenvlib.py --3.7.3 --max=500
+	SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-3.6.cover $(PYTHON) test_pyenvlib.py --3.6.4 --max=280
 
 #: Check deparsing Python 2.6
 check-bytecode-2.6:
+	$(PYTHON) test_pythonlib.py --bytecode-2.6 --weak-verify
 	$(PYTHON) test_pythonlib.py --bytecode-2.6-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-2.6 --syntax-verify
 
 #: Check deparsing Python 2.7
 check-bytecode-2.7:
+	$(PYTHON) test_pythonlib.py --bytecode-2.7 --weak-verify
 	$(PYTHON) test_pythonlib.py --bytecode-2.7-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-2.7 --syntax-verify
 
 #: Check deparsing Python 3.0
 check-bytecode-3.0:
-	$(PYTHON) test_pythonlib.py --bytecode-3.0-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.0 --syntax-verify
+	$(PYTHON) test_pythonlib.py --bytecode-3.0 --weak-verify
 
 #: Check deparsing Python 3.1
 check-bytecode-3.1:
+	$(PYTHON) test_pythonlib.py --bytecode-3.1 --weak-verify
 	$(PYTHON) test_pythonlib.py --bytecode-3.1-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.1 --syntax-verify
 
 #: Check deparsing Python 3.2
 check-bytecode-3.2:
+	$(PYTHON) test_pythonlib.py --bytecode-3.2 --weak-verify
 	$(PYTHON) test_pythonlib.py --bytecode-3.2-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.2 --syntax-verify
 
 #: Check deparsing Python 3.3
 check-bytecode-3.3:
+	$(PYTHON) test_pythonlib.py --bytecode-3.3 --weak-verify
 	$(PYTHON) test_pythonlib.py --bytecode-3.3-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.3 --syntax-verify
 
 #: 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-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.4 --syntax-verify
 
 #: Check deparsing Python 3.5
 check-bytecode-3.5:
+	$(PYTHON) test_pythonlib.py --bytecode-3.5 --weak-verify
 	$(PYTHON) test_pythonlib.py --bytecode-3.5-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.5 --syntax-verify
 
 #: Check deparsing Python 3.6
 check-bytecode-3.6:
+	$(PYTHON) test_pythonlib.py --bytecode-3.6 --weak-verify
 	$(PYTHON) test_pythonlib.py --bytecode-3.6-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.6 --syntax-verify
 
 #: Check deparsing Python 3.7
 check-bytecode-3.7:
-	$(PYTHON) test_pythonlib.py --bytecode-3.7-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.7 --syntax-verify
-
-#: Check deparsing Python 3.8
-check-bytecode-3.8:
-	$(PYTHON) test_pythonlib.py --bytecode-3.8-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.8 --syntax-verify
+	$(PYTHON) test_pythonlib.py --bytecode-3.7 --weak-verify
 
 #: short tests for bytecodes only for this version of Python
 check-native-short:
-	$(PYTHON) test_pythonlib.py --bytecode-$(PYTHON_VERSION) --syntax-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --bytecode-$(PYTHON_VERSION) --weak-verify $(COMPILE)
 	$(PYTHON) test_pythonlib.py --bytecode-$(PYTHON_VERSION)-run --verify-run $(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 --syntax-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --ok-2.6 --weak-verify $(COMPILE)
 
 #: Run longer Python 2.7's lib files known to be okay
 check-2.7-ok:
-	$(PYTHON) test_pythonlib.py --ok-2.7 --syntax-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --ok-2.7 --weak-verify $(COMPILE)
 
 #: Run longer Python 3.2's lib files known to be okay
 check-3.2-ok:
-	$(PYTHON) test_pythonlib.py --ok-3.2 --syntax-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --ok-3.2 --weak-verify $(COMPILE)
 
 #: Run longer Python 3.4's lib files known to be okay
 check-3.4-ok:
-	$(PYTHON) test_pythonlib.py --ok-3.4 --syntax-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --ok-3.4 --weak-verify $(COMPILE)
 
 #: PyPy of some sort. E.g. [PyPy 5.0.1 with GCC 4.8.4]
 # Skip for now
 2.6:
 
 #: PyPy 5.0.x with Python 2.7 ...
-pypy-2.7 5.0 5.3 6.0:
+pypy-2.7 5.0 5.3:
 	$(PYTHON) test_pythonlib.py --bytecode-pypy2.7 --verify
 
 #: PyPy 2.4.x with Python 3.2 ...
 pypy-3.2 2.4:
 	$(PYTHON) test_pythonlib.py --bytecode-pypy3.2 --verify
 
-#: PyPy 5.0.x with Python 3.6 ...
-7.1:
-	$(PYTHON) test_pythonlib.py --bytecode-pypy3.6 --verify
-
-
-
 clean: clean-py-dis clean-dis clean-unverified
 
 clean-dis:

test/add-test.py

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