Need parens in unpack in 2.4ish

main.py: 2.7ism creaped in.

.circleci/config.yml

@@ -27,9 +27,9 @@ jobs:
     # 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
+    docker:
+    - image: circleci/build-image:ubuntu-14.04-XXL-upstart-1189-5614f37
+      command: /sbin/init
     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
@@ -42,24 +42,23 @@ jobs:
     # 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
+        command: pyenv install 2.4.6 && pyenv local 2.4.6 && pyenv rehash && easy_install nose && 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 branch if available
+        - v1-dep-{{ .Branch }}-
+        # Default branch if not
+        - v1-dep-master-
+        # Any branch if there are none on the default branch - this should be unnecessary if you have your default branch configured correctly
+        - v1-dep-
     # 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
-
+    - run: easy_install spark_parser==1.8.5 && easy_install xdis==3.8.4
     # Save dependency cache
     - save_cache:
-        key: v2-dependencies-{{ .Branch }}-{{ epoch }}
+        key: v1-dep-{{ .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
@@ -68,13 +67,14 @@ jobs:
         - ~/.m2
         - ~/.ivy2
         - ~/.bundle
+        - ~/.go_workspace
+        - ~/.gradle
         - ~/.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'
+    - run: python ./setup.py develop && make check-2.4
+    - run: cd ./test/stdlib && pyenv local 2.4.6 && 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

.travis.yml

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

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

@@ -1,44 +1,15 @@
-3.4.1 2019-10-02
-================
-
-- Correct assert{,2} transforms Fixes #289
-- Fragment parsing fixes:
-     * Wasn't handling 3-arg %p
-   	 * fielding error in code_deparse()
-- Use newer xdis to better track Python 3.8.0
-
-
-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
+- Handle annotation args in Python 3.x
+- Fix vararg and function signatures in 3.x
+- Some 3.x < 3.6 while(1)/if fixes - others remain
+- Start reinstating else if -> elif
+- LOAD_CONST -> LOAD_CODE where appropriate
+- option `weak-verify` is now `syntax-verify`
+- code cleanups, start using "blacken" to reformat text
 
 
 3.3.4 2019-06-19 Fleetwood at 65
@@ -47,12 +18,12 @@ Again, most of the work in this is release is thanks to x0ret.
 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)
+- 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)
+- 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
 
@@ -96,7 +67,7 @@ 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`)
+Pypy 3.6 support was started. Pypy 3.x detection fixed (via xdis)
 
 3.3.1 2019-04-19 Good Friday
 ==========================
@@ -115,8 +86,7 @@ Lots of decomplation bugs, especially in the 3.x series fixed. Don't worry thoug
 3.3.0 2019-04-14 Holy Week
 ==========================
 
-* First cut at Python 3.8 (many bugs remain)
-* Reinstate -c | --compile (compile before disassembly) option
+* First cut at Python 3.8 (many bug remain)
 * The usual smattering of bug and doc fixes
 
 3.2.6 2019-03-23 Mueller Report
@@ -180,7 +150,7 @@ Pull Requests
 
 - 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
@@ -285,24 +255,24 @@ function calls and definitions.
 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
 =====================
 
-- 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
@@ -313,15 +283,15 @@ function calls and definitions.
 
 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
@@ -330,11 +300,11 @@ Decompilation bug fixes, mostly 3.6 and pre 2.7
 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
 =========================================
@@ -343,7 +313,7 @@ Decompilation bug fixes, mostly 3.6 and pre 2.7
   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
 =====================
@@ -359,16 +329,16 @@ 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
 
@@ -388,12 +358,12 @@ Overall: better 3.6 decompiling and some much needed code refactoring and cleanu
 - 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
 =====================
 
-- 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
@@ -407,13 +377,13 @@ Overall: better 3.6 decompiling and some much needed code refactoring and cleanu
 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
 
@@ -423,15 +393,15 @@ Overall: better 3.6 decompiling and some much needed code refactoring and cleanu
 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
 =====================
 
 - 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
 
@@ -439,55 +409,55 @@ Very minor changes
 =====================
 
 - Python 3.x annotation and function signature fixes
-- Bump `xdis` version
-- Small `pysource.py` bug fixes
+- Bump xdis version
+- Small pysource bug fixes
 
 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
 ========================================
 
 - 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
 =======================================
 
 - 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
 =====================
 
-- 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
@@ -495,7 +465,7 @@ Very minor changes
 
 - 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
 
@@ -511,13 +481,13 @@ Very minor changes
 ====================
 
 - 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
 
@@ -528,9 +498,9 @@ Very minor changes
 - 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
 ====================
@@ -546,7 +516,7 @@ Very minor changes
 
 - 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.
@@ -566,7 +536,7 @@ Very minor changes
   * 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
 
 
@@ -580,12 +550,12 @@ Very minor changes
 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)
@@ -611,12 +581,12 @@ Release forced by incompatibility change in` xdis` 3.2.0.
 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
@@ -625,8 +595,8 @@ Release forced by incompatibility change in` xdis` 3.2.0.
 - 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!
 =======================================
@@ -671,8 +641,8 @@ control-flow structure detection is done.
 - 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
 ====================
@@ -722,7 +692,7 @@ control-flow structure detection is done.
 ====================
 
 - 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
@@ -785,9 +755,9 @@ control-flow structure detection is done.
 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
@@ -795,12 +765,12 @@ control-flow structure detection is done.
 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
 ====================
 
-- 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
 
@@ -810,7 +780,7 @@ control-flow structure detection is done.
 - 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
@@ -818,7 +788,7 @@ control-flow structure detection is done.
 
 - 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
@@ -860,5 +830,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,8 +1,4 @@
-|buildstatus|  |Pypi Installs| |Latest Version| |Supported Python Versions|
-
-
-
-|packagestatus|
+|buildstatus| |Latest Version| |Supported Python Versions|
 
 uncompyle6
 ==========
@@ -136,7 +132,7 @@ could be compared with the original bytecode. However as Python's code
 generation got better, this no longer was feasible.
 
 If you want Python syntax verification of the correctness of the
-decompilation process, add the :code:`--syntax-verify` option. However since
+decompilation process, add the `--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.
@@ -150,7 +146,7 @@ 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
+suite for the standard library. We have some code in `test/stdlib` to
 facilitate this kind of checking too.
 
 Known Bugs/Restrictions
@@ -181,15 +177,15 @@ In the Python 3 series, Python support is is strongest around 3.4 or
 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`
+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
-:code:`EXTENDED_ARG` instructions, additional jump optimization has been
+`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.
+`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
@@ -221,7 +217,7 @@ 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
+* https://github.com/wibiti/uncompyle2 : supports Python 2.7 only, but does that fairly well. There are situations where `uncompyle6` results are incorrect while `uncompyle2` results are not, but more often uncompyle6 is correct when uncompyle2 is not. Because `uncompyle6` adheres to accuracy over idiomatic Python, `uncompyle2` can produce more natural-looking code when it is correct. Currently `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>`_
 * The HISTORY_ file.
 * https://github.com/rocky/python-xdis : Cross Python version disassembler
@@ -238,12 +234,9 @@ 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
-.. |Pypi Installs| image:: https://pepy.tech/badge/uncompyle6/month

__pkginfo__.py

@@ -26,46 +26,46 @@ copyright   = """
 Copyright (C) 2015-2019 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.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',
                 ]
 
 # 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.4, < 4.1.0"]
+install_requires   = ['spark-parser >= 1.8.7, < 1.9.0',
+                      'xdis >= 4.0.2, < 4.1.0']
 
-license            = "GPL3"
-mailing_list       = "python-debugger@googlegroups.com"
-modname            = "uncompyle6"
+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 +82,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/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.9 3.7.4 2.6.9 3.3.7 2.7.16 3.2.6 3.1.5 3.4.10 3.5.7'
+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'

admin-tools/update-sources.sh

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

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_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_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]
@@ -185,11 +181,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,7 +1,4 @@
-import pytest
 from uncompyle6 import PYTHON_VERSION, code_deparse
-pytestmark = pytest.mark.skip(PYTHON_VERSION < 2.7,
-                              reason="need at least Python 2.7")
 
 if PYTHON_VERSION > 2.6:
     def test_single_mode():

pytest/testdata/if-2.7.right

@@ -9,4 +9,4 @@
           12  JUMP_FORWARD          0  'to 15'
         15_0  COME_FROM            12  '12'
           15  LOAD_CONST               None
-          18  RETURN_VALUE     
+          18  RETURN_VALUE

pytest/testdata/ifelse-2.7.right

@@ -12,4 +12,4 @@
           18  STORE_NAME            2  'd'
         21_0  COME_FROM            12  '12'
           21  LOAD_CONST               None
-          24  RETURN_VALUE     
+          24  RETURN_VALUE

pytest/validate.py

@@ -1,20 +1,16 @@
 # future
 from __future__ import print_function
-
 # std
 import os
 import difflib
 import subprocess
 import tempfile
 import functools
-
 # uncompyle6 / xdis
 from uncompyle6 import PYTHON_VERSION, PYTHON3, IS_PYPY, code_deparse
-
 # 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
@@ -24,7 +20,6 @@ if PYTHON3:
 else:
     from StringIO import StringIO
 
-
 def _dis_to_text(co):
     return Bytecode(co).dis()
 
@@ -38,32 +33,36 @@ 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.write(str(diff).encode('utf-8'))
 
     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))
+        print('\n'.join(diff))
     finally:
         os.unlink(f.name)
 
@@ -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,22 @@ 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 = code_deparse(original_code,
+                            out=six.StringIO(),
+                            version=PYTHON_VERSION,
+                            compile_mode=mode)
     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 +138,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,2 @@
 flake8
 hypothesis<=3.0.0
-six
-pytest==3.2.5

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, 8)):
+        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

@@ -29,7 +29,7 @@ check:
 	$(MAKE) check-$(PYTHON_VERSION)
 
 #: Run working tests from Python 2.6 or 2.7
-check-2.6 check-2.7: check-bytecode-2 check-bytecode-3 check-bytecode-1 check-native-short
+check-2.4 check-2.5 check-2.6 check-2.7: check-bytecode-2 check-bytecode-3 check-bytecode-1  check-native-short
 
 #: Run working tests from Python 3.0
 check-3.0: check-bytecode
@@ -71,10 +71,10 @@ 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)
+# #: 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)
 
 # FIXME
 #: this is called when running under pypy3.5-5.8.0 or pypy2-5.6.0
@@ -98,7 +98,7 @@ 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-3.7 \
 	--bytecode-pypy3.2
 
 #: Check deparsing on selected bytecode 3.x
@@ -148,6 +148,7 @@ check-bytecode-2.3:
 
 #: Check deparsing Python 2.4
 check-bytecode-2.4:
+	$(PYTHON) test_pythonlib.py --bytecode-2.4-run --verify-run
 	$(PYTHON) test_pythonlib.py --bytecode-2.4
 
 #: Check deparsing Python 2.5
@@ -276,16 +277,20 @@ 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
+# #: 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
 
 #: 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)-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)

test/add-test.py

@@ -2,23 +2,22 @@
 """ Trivial helper program to bytecompile and run an uncompile
 """
 import os, sys, py_compile
-
 assert len(sys.argv) >= 2
 version = sys.version[0:3]
-if sys.argv[1] in ("--run", "-r"):
-    suffix = "_run"
+if sys.argv[1] == '--run':
+    suffix = '_run'
     py_source = sys.argv[2:]
 else:
-    suffix = ""
+    suffix = ''
     py_source = sys.argv[1:]
 
 for path in py_source:
     short = os.path.basename(path)
-    if hasattr(sys, "pypy_version_info"):
-        cfile = "bytecode_pypy%s%s/%s" % (version, suffix, short) + "c"
+    if hasattr(sys, 'pypy_version_info'):
+        cfile =  "bytecode_pypy%s%s/%s" % (version, suffix, short) + 'c'
     else:
-        cfile = "bytecode_%s%s/%s" % (version, suffix, short) + "c"
+        cfile =  "bytecode_%s%s/%s" % (version, suffix, short) + 'c'
     print("byte-compiling %s to %s" % (path, cfile))
     py_compile.compile(path, cfile)
     if isinstance(version, str) or version >= (2, 6, 0):
-        os.system("../bin/uncompyle6 -a -T %s" % cfile)
+        os.system("../bin/uncompyle6 -a -t %s" % cfile)

test/dis-compare.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python
 # Mode: -*- python -*-
 #
-# Copyright (c) 2015 by Rocky Bernstein <rb@dustyfeet.com>
+# Copyright (c) 2015, 2017 by Rocky Bernstein <rb@dustyfeet.com>
 #
-from __future__ import print_function
 
 
 import dis, os.path

test/simple-uncompyle-code-test.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
-
+from uncompyle6 import uncompyle
 from uncompyle6.main import decompile
 from xdis.magics import sysinfo2float
 import sys, inspect

test/simple_source/bug25/02_yield_bug.py

@@ -0,0 +1,7 @@
+# From 2.4 test_array.py
+# In Python 2.4 and earlier "yield" is not valid and instead
+# we must use "yield None". Bug was not adding "None"
+
+def yield_bug():
+    yield None
+    return

test/simple_source/bug25/04_try_else_confuse.py

@@ -0,0 +1,19 @@
+# From 2.4 test_sax.py
+# Bug was distinguishing try from try/else
+
+def verify_empty_attrs():
+    gvqk = 3
+    try:
+        gvk = 1/0
+    except ZeroDivisionError:
+        gvk = 1
+
+    try:
+        gvqk = 0
+    except KeyError:
+        gvqk = 1
+
+    # If try/else was used above the return will be 4
+    return gvk + gvqk
+
+assert 1 == verify_empty_attrs()

test/simple_source/bug26/01_if_while_return.py

@@ -1,19 +0,0 @@
-# Issue #284 in Python 2.6
-# See https://github.com/rocky/python-uncompyle6/issues/284
-# Decompilation failed when return was the last statetement
-# in the while loop inside the if block
-
-# This code is RUNNABLE!
-
-def f1():
-    if True:
-        while True:
-            return 5
-
-def f2():
-    if True:
-        while 1:
-            return 6
-
-
-assert f1() == 5 and f2() == 6

test/simple_source/bug35/02_build_list_unpack.py

@@ -1,17 +0,0 @@
-a = 5
-x = [1, 2, 3]
-i = [(a,), x]
-j = [a, *x]
-
-def f1(a):
-    return a[0], a[1]
-
-def f2(b):
-    return len(b), b[0]+5, b[2]
-
-def f3(x, y):
-    return [1, *x, y]
-
-assert f1(i) == ((5,), x)
-assert f2(j) == (4, 10, 2)
-assert f3(x, a) == [1, 1, 2, 3, 5]

test/simple_source/bug37/01_assert2.py

@@ -1,8 +0,0 @@
-# Self-checking test.
-# Bug was in if transform not inverting expression
-# This file is RUNNABLE!
-def test_assert2(c):
-    if c < 2:
-        raise SyntaxError('Oops')
-
-test_assert2(5)

test/stdlib/runtests.sh

@@ -56,46 +56,18 @@ case $PYVERSION in
 	;;
     2.6)
 	SKIP_TESTS=(
-	    [test_aepack.py]=1
-	    [test_aifc.py]=1
-	    [test_array.py]=1
-	    [test_audioop.py]=1
-	    [test_base64.py]=1
-	    [test_bigmem.py]=1
-	    [test_binascii.py]=1
-	    [test_builtin.py]=1
-	    [test_bytes.py]=1
-	    [test_class.py]=1
-	    [test_codeccallbacks.py]=1
-	    [test_codecencodings_cn.py]=1
-	    [test_codecencodings_hk.py]=1
-	    [test_codecencodings_jp.py]=1
-	    [test_codecencodings_kr.py]=1
-	    [test_codecencodings_tw.py]=1
-	    [test_codecencodings_cn.py]=1
-	    [test_codecmaps_hk.py]=1
-	    [test_codecmaps_jp.py]=1
-	    [test_codecmaps_kr.py]=1
-	    [test_codecmaps_tw.py]=1
-	    [test_codecs.py]=1
 	    [test_compile.py]=1  # Intermittent - sometimes works and sometimes doesn't
-	    [test_cookielib.py]=1
-	    [test_copy.py]=1
-	    [test_decimal.py]=1
-	    [test_descr.py]=1    # Problem in pickle.py?
-	    [test_exceptions.py]=1
-	    [test_extcall.py]=1
-	    [test_float.py]=1
-	    [test_future4.py]=1
-	    [test_generators.py]=1
+	    [test_grammar.py]=1  # Need real flow control. "and" in side "or"
+	                         # "and" inside ifelse need to simulatenously work
 	    [test_grp.py]=1      # Long test - might work Control flow?
 	    [test_opcodes.py]=1
 	    [test_pwd.py]=1 # Long test - might work? Control flow?
 	    [test_re.py]=1 # Probably Control flow?
 	    [test_queue.py]=1 # Control flow?
+	    [test_strftime.py]=1
 	    [test_trace.py]=1  # Line numbers are expected to be different
 	    [test_zipfile64.py]=1  # Skip Long test
-	    [test_zlib.py]=1  # Takes too long to run (more than 3 minutes 39 seconds)
+	    [test_zlib.py]=1  # Look at
 	    # .pyenv/versions/2.6.9/lib/python2.6/lib2to3/refactor.pyc
 	    # .pyenv/versions/2.6.9/lib/python2.6/pyclbr.pyc
 	    # .pyenv/versions/2.6.9/lib/python2.6/quopri.pyc -- look at ishex, is short
@@ -131,11 +103,9 @@ case $PYVERSION in
 	    [test_httplib.py]=1  # Ok, but POWER has problems with this
 	    [test_pdb.py]=1 # Ok, but POWER has problems with this
 
-	    [test_capi.py]=1
 	    [test_curses.py]=1  # Possibly fails on its own but not detected
 	    [test_dis.py]=1   # We change line numbers - duh!
 	    [test_doctest.py]=1 # Fails on its own
-	    [test_exceptions.py]=1
 	    [test_format.py]=1  # control flow. uncompyle2 does not have problems here
 	    [test_generators.py]=1  # control flow. uncompyle2 has problem here too
 	    [test_grammar.py]=1     # Too many stmts. Handle large stmts
@@ -143,9 +113,6 @@ case $PYVERSION in
 	    [test_ioctl.py]=1 # Test takes too long to run
 	    [test_itertools.py]=1 # Fix erroneous reduction to "conditional_true".
 	                          # See test/simple_source/bug27+/05_not_unconditional.py
-	    [test_long.py]=1
-	    [test_long_future.py]=1
-	    [test_math.py]=1
 	    [test_memoryio.py]=1 # FIX
 	    [test_multiprocessing.py]=1 # On uncompyle2, taks 24 secs
 	    [test_pep352.py]=1  # ?
@@ -155,11 +122,9 @@ case $PYVERSION in
 	    [test_pty.py]=1
 	    [test_queue.py]=1   # Control flow?
 	    [test_re.py]=1      # Probably Control flow?
-	    [test_runpy.py]=1   # Long and fails on its own
 	    [test_select.py]=1  # Runs okay but takes 11 seconds
 	    [test_socket.py]=1  # Runs ok but takes 22 seconds
 	    [test_subprocess.py]=1 # Runs ok but takes 22 seconds
-	    [test_sys_setprofile.py]=1
 	    [test_sys_settrace.py]=1 # Line numbers are expected to be different
 	    [test_strtod.py]=1 # FIX
 	    [test_traceback.py]=1 # Line numbers change - duh.
@@ -223,7 +188,6 @@ fi
 mkdir $TESTDIR || exit $?
 cp -r ${PYENV_ROOT}/versions/${PYVERSION}.${MINOR}/lib/python${PYVERSION}/test $TESTDIR
 cd $TESTDIR/test
-pyenv local $FULLVERSION
 export PYTHONPATH=$TESTDIR
 
 # Run tests
@@ -240,14 +204,10 @@ else
 fi
 
 typeset -i ALL_FILES_STARTTIME=$(date +%s)
-typeset -i skipped=0
 
 for file in $files; do
     # AIX bash doesn't grok [[ -v SKIP... ]]
-    if [[ ${SKIP_TESTS[$file]} == 1 ]] ; then
-	((skipped++))
-	continue
-    fi
+    [[ ${SKIP_TESTS[$file]} == 1 ]] && continue
 
     # If the fails *before* decompiling, skip it!
     typeset -i STARTTIME=$(date +%s)
@@ -281,7 +241,7 @@ for file in $files; do
     fi
     (( rc != 0 && allerrs++ ))
     if (( STOP_ONERROR && rc )) ; then
-	echo "** Ran $i tests before failure. Skipped $skipped test for known failures. **"
+	echo "** Ran $i tests before failure **"
 	exit $allerrs
     fi
 done
@@ -291,5 +251,5 @@ typeset -i ALL_FILES_ENDTIME=$(date +%s)
 
 printf "Ran $i unit-test files in "
 displaytime $time_diff
-echo "Skipped $skipped test for known failures."
+
 exit $allerrs

test/test_pyenvlib.py

@@ -20,85 +20,71 @@ Step 2: Run the test:
 	  test_pyenvlib --mylib --verify # decompile verify 'mylib'
 """
 
-from __future__ import print_function
-
+from uncompyle6 import main, PYTHON3
 import os, time, re, shutil, sys
 from fnmatch import fnmatch
 
 from uncompyle6 import main, PYTHON3
 import xdis.magics as magics
 
-# ----- configure this for your needs
+#----- configure this for your needs
 
-python_versions = [v for v in magics.python_versions if re.match("^[0-9.]+$", v)]
+python_versions = [v for v in magics.python_versions if
+                       re.match('^[0-9.]+$', v)]
 
 # FIXME: we should remove Python versions that we don't support.
 # These include Jython, and Python bytecode changes pre release.
 
 TEST_VERSIONS = (
-    "pypy3-2.4.0",
-    "pypy-2.6.1",
-    "pypy-5.0.1",
-    "pypy-5.3.1",
-    "pypy3.5-5.7.1-beta",
-    "pypy3.5-5.9.0",
-    "pypy3.5-6.0.0",
-    "native",
-) + tuple(python_versions)
+               'pypy3-2.4.0', 'pypy-2.6.1',
+               'pypy-5.0.1', 'pypy-5.3.1', 'pypy3.5-5.7.1-beta',
+               'pypy3.5-5.9.0', 'pypy3.5-6.0.0',
+               'native') + tuple(python_versions)
 
 
-target_base = "/tmp/py-dis/"
-lib_prefix = os.path.join(os.environ["HOME"], ".pyenv/versions")
+target_base = '/tmp/py-dis/'
+lib_prefix = os.path.join(os.environ['HOME'], '.pyenv/versions')
 
-PYC = ("*.pyc",)
-PYO = ("*.pyo",)
-PYOC = ("*.pyc", "*.pyo")
+PYC = ('*.pyc', )
+PYO = ('*.pyo', )
+PYOC = ('*.pyc', '*.pyo')
 
-# -----
+#-----
 
 test_options = {
     # name: (src_basedir, pattern, output_base_suffix)
-    "test": ("./test", PYOC, "test"),
-    "max=": 200,
-}
+    'test': ('./test', PYOC, 'test'),
+    'max=': 200,
+    }
 
 for vers in TEST_VERSIONS:
-    if vers.startswith("pypy"):
-        if vers.startswith("pypy3."):
+    if vers.startswith('pypy'):
+        if vers.startswith('pypy3.'):
             short_vers = vers[4:6]
         else:
             short_vers = vers[0:-2]
 
-        test_options[vers] = (
-            os.path.join(lib_prefix, vers, "lib_pypy"),
-            PYC,
-            "python-lib" + short_vers,
-        )
+        test_options[vers] = (os.path.join(lib_prefix, vers, 'lib_pypy'),
+                              PYC, 'python-lib'+short_vers)
     else:
-        if vers == "native":
+        if vers == 'native':
             short_vers = os.path.basename(sys.path[-1])
-            test_options[vers] = (sys.path[-1], PYC, short_vers)
+            test_options[vers] = (sys.path[-1],
+                                  PYC, short_vers)
         else:
             short_vers = vers[:3]
-            test_options[vers] = (
-                os.path.join(lib_prefix, vers, "lib", "python" + short_vers),
-                PYC,
-                "python-lib" + short_vers,
-            )
+            test_options[vers] = (os.path.join(lib_prefix, vers, 'lib', 'python'+short_vers),
+                                  PYC, 'python-lib'+short_vers)
 
+def do_tests(src_dir, patterns, target_dir, start_with=None,
+             do_verify=False, max_files=200):
 
-def do_tests(
-    src_dir, patterns, target_dir, start_with=None, do_verify=False, max_files=200
-):
     def visitor(files, dirname, names):
         files.extend(
-            [
-                os.path.normpath(os.path.join(dirname, n))
-                for n in names
-                for pat in patterns
-                if fnmatch(n, pat)
-            ]
-        )
+            [os.path.normpath(os.path.join(dirname, n))
+                 for n in names
+                    for pat in patterns
+                        if fnmatch(n, pat)])
 
     files = []
     cwd = os.getcwd()
@@ -106,13 +92,10 @@ def do_tests(
     if PYTHON3:
         for root, dirname, names in os.walk(os.curdir):
             files.extend(
-                [
-                    os.path.normpath(os.path.join(root, n))
-                    for n in names
-                    for pat in patterns
-                    if fnmatch(n, pat)
-                ]
-            )
+                [os.path.normpath(os.path.join(root, n))
+                     for n in names
+                        for pat in patterns
+                            if fnmatch(n, pat)])
             pass
         pass
     else:
@@ -124,29 +107,26 @@ def do_tests(
         try:
             start_with = files.index(start_with)
             files = files[start_with:]
-            print(">>> starting with file", files[0])
+            print('>>> starting with file', files[0])
         except ValueError:
             pass
 
     if len(files) > max_files:
-        files = [file for file in files if not "site-packages" in file]
-        files = [file for file in files if not "test" in file]
+        files = [file for file in files if not 'site-packages' in file]
+        files = [file for file in files if not 'test' in file]
         if len(files) > max_files:
             # print("Number of files %d - truncating to last 200" % len(files))
-            print(
-                "Number of files %d - truncating to first %s" % (len(files), max_files)
-            )
+            print("Number of files %d - truncating to first %s" %
+                  (len(files), max_files))
             files = files[:max_files]
 
     print(time.ctime())
-    (tot_files, okay_files, failed_files, verify_failed_files) = main.main(
-        src_dir, target_dir, files, [], do_verify=do_verify
-    )
+    (tot_files, okay_files, failed_files,
+     verify_failed_files) = main.main(src_dir, target_dir, files, [], do_verify=do_verify)
     print(time.ctime())
     return verify_failed_files + failed_files
 
-
-if __name__ == "__main__":
+if __name__ == '__main__':
     import getopt, sys
 
     do_coverage = do_verify = False
@@ -155,46 +135,38 @@ if __name__ == "__main__":
 
     test_options_keys = list(test_options.keys())
     test_options_keys.sort()
-    opts, args = getopt.getopt(
-        sys.argv[1:],
-        "",
-        [
-            "start-with=",
-            "verify",
-            "verify-run",
-            "syntax-verify",
-            "max=",
-            "coverage",
-            "all",
-        ]
-        + test_options_keys,
-    )
-    vers = ""
+    opts, args = getopt.getopt(sys.argv[1:], '',
+                               ['start-with=', 'verify', 'verify-run', 'syntax-verify',
+                                'max=', 'coverage', 'all', ] \
+                               + test_options_keys )
+    vers = ''
 
     for opt, val in opts:
-        if opt == "--verify":
-            do_verify = "strong"
-        elif opt == "--syntax-verify":
-            do_verify = "weak"
-        elif opt == "--verify-run":
-            do_verify = "verify-run"
-        elif opt == "--coverage":
+        if opt == '--verify':
+            do_verify = 'strong'
+        elif opt == '--syntax-verify':
+            do_verify = 'weak'
+        elif opt == '--verify-run':
+            do_verify = 'verify-run'
+        elif opt == '--coverage':
             do_coverage = True
-        elif opt == "--start-with":
+        elif opt == '--start-with':
             start_with = val
         elif opt[2:] in test_options_keys:
             triple = test_options[opt[2:]]
             vers = triple[-1]
             test_dirs.append(triple)
-        elif opt == "--max":
-            test_options["max="] = int(val)
-        elif opt == "--all":
-            vers = "all"
+        elif opt == '--max':
+            test_options['max='] = int(val)
+        elif opt == '--all':
+            vers = 'all'
             for val in test_options_keys:
                 test_dirs.append(test_options[val])
 
     if do_coverage:
-        os.environ["SPARK_PARSER_COVERAGE"] = "/tmp/spark-grammar-%s.cover" % vers
+        os.environ['SPARK_PARSER_COVERAGE'] = (
+            '/tmp/spark-grammar-%s.cover' % vers
+            )
 
     failed = 0
     for src_dir, pattern, target_dir in test_dirs:
@@ -202,14 +174,8 @@ if __name__ == "__main__":
             target_dir = os.path.join(target_base, target_dir)
             if os.path.exists(target_dir):
                 shutil.rmtree(target_dir, ignore_errors=1)
-            failed += do_tests(
-                src_dir,
-                pattern,
-                target_dir,
-                start_with,
-                do_verify,
-                test_options["max="],
-            )
+            failed += do_tests(src_dir, pattern, target_dir, start_with,
+                               do_verify, test_options['max='])
         else:
             print("### Path %s doesn't exist; skipping" % src_dir)
             pass

test/test_pythonlib.py

@@ -27,97 +27,75 @@ Step 2: Run the test:
   test_pythonlib.py --mylib --verify # decompile verify 'mylib'
 """
 
-from __future__ import print_function
-
 import getopt, os, py_compile, sys, shutil, tempfile, time
 
 from uncompyle6 import PYTHON_VERSION
 from uncompyle6.main import main
 from fnmatch import fnmatch
 
-
 def get_srcdir():
     filename = os.path.normcase(os.path.dirname(__file__))
     return os.path.realpath(filename)
 
-
 src_dir = get_srcdir()
 
 
-# ----- configure this for your needs
+#----- configure this for your needs
 
-lib_prefix = "/usr/lib"
-# lib_prefix = [src_dir, '/usr/lib/', '/usr/local/lib/']
+lib_prefix = '/usr/lib'
+#lib_prefix = [src_dir, '/usr/lib/', '/usr/local/lib/']
 
-target_base = tempfile.mkdtemp(prefix="py-dis-")
+target_base = tempfile.mkdtemp(prefix='py-dis-')
 
-PY = ("*.py",)
-PYC = ("*.pyc",)
-PYO = ("*.pyo",)
-PYOC = ("*.pyc", "*.pyo")
+PY = ('*.py', )
+PYC = ('*.pyc', )
+PYO = ('*.pyo', )
+PYOC = ('*.pyc', '*.pyo')
 
 test_options = {
     # name:   (src_basedir, pattern, output_base_suffix, python_version)
-    "test": ("test", PYC, "test"),
-    "ok-2.6": (os.path.join(src_dir, "ok_lib2.6"), PYOC, "ok-2.6", 2.6),
-    "ok-2.7": (os.path.join(src_dir, "ok_lib2.7"), PYOC, "ok-2.7", 2.7),
-    "ok-3.2": (os.path.join(src_dir, "ok_lib3.2"), PYOC, "ok-3.2", 3.2),
-    "base-2.7": (
-        os.path.join(src_dir, "base_tests", "python2.7"),
-        PYOC,
-        "base_2.7",
-        2.7,
-    ),
+    'test':
+        ('test', PYC, 'test'),
+
+    'ok-2.6':    (os.path.join(src_dir, 'ok_lib2.6'),
+                 PYOC, 'ok-2.6', 2.6),
+
+    'ok-2.7':    (os.path.join(src_dir, 'ok_lib2.7'),
+                 PYOC, 'ok-2.7', 2.7),
+
+    'ok-3.2':    (os.path.join(src_dir, 'ok_lib3.2'),
+                 PYOC, 'ok-3.2', 3.2),
+
+    'base-2.7':  (os.path.join(src_dir, 'base_tests', 'python2.7'),
+                  PYOC, 'base_2.7', 2.7),
 }
 
-for vers in (2.7, 3.4, 3.5, 3.6):
+for  vers in (2.7, 3.4, 3.5, 3.6):
     pythonlib = "ok_lib%s" % vers
     key = "ok-%s" % vers
     test_options[key] = (os.path.join(src_dir, pythonlib), PYOC, key, vers)
     pass
 
-for vers in (
-    1.3,
-    1.4,
-    1.5,
-    2.1,
-    2.2,
-    2.3,
-    2.4,
-    2.5,
-    2.6,
-    2.7,
-    3.0,
-    3.1,
-    3.2,
-    3.3,
-    3.4,
-    3.5,
-    3.6,
-    3.7,
-    3.8,
-    "pypy3.2",
-    "pypy2.7",
-    "pypy3.6",
-):
+for  vers in (1.3, 1.4, 1.5,
+              2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7,
+              3.0, 3.1, 3.2, 3.3,
+              3.4, 3.5, 3.6, 3.7, 3.8, 'pypy3.2', 'pypy2.7', 'pypy3.6'):
     bytecode = "bytecode_%s" % vers
     key = "bytecode-%s" % vers
-    test_options[key] = (bytecode, PYC, bytecode, vers)
+    test_options[key] =  (bytecode, PYC, bytecode, vers)
     bytecode = "bytecode_%s_run" % vers
     key = "bytecode-%s-run" % vers
-    test_options[key] = (bytecode, PYC, bytecode, vers)
+    test_options[key] =  (bytecode, PYC, bytecode, vers)
     key = "%s" % vers
     pythonlib = "python%s" % vers
     if isinstance(vers, float) and vers >= 3.0:
-        pythonlib = os.path.join(pythonlib, "__pycache__")
-    test_options[key] = (os.path.join(lib_prefix, pythonlib), PYOC, pythonlib, vers)
-
-# -----
+        pythonlib = os.path.join(pythonlib, '__pycache__')
+    test_options[key] =  (os.path.join(lib_prefix, pythonlib), PYOC, pythonlib, vers)
 
+#-----
 
 def help():
-    print(
-        """Usage-Examples:
+    print("""Usage-Examples:
 
   # compile, decompyle and verify short tests for Python 2.7:
   test_pythonlib.py --bytecode-2.7 --verify --compile
@@ -127,21 +105,18 @@ def help():
 
   # decompile and verify known good python 2.7
   test_pythonlib.py --ok-2.7 --verify
-"""
-    )
+""")
     sys.exit(1)
 
 
 def do_tests(src_dir, obj_patterns, target_dir, opts):
+
     def file_matches(files, root, basenames, patterns):
         files.extend(
-            [
-                os.path.normpath(os.path.join(root, n))
-                for n in basenames
-                for pat in patterns
-                if fnmatch(n, pat)
-            ]
-        )
+            [os.path.normpath(os.path.join(root, n))
+                 for n in basenames
+                    for pat in patterns
+                        if fnmatch(n, pat)])
 
     files = []
     # Change directories so use relative rather than
@@ -150,14 +125,13 @@ def do_tests(src_dir, obj_patterns, target_dir, opts):
     cwd = os.getcwd()
     os.chdir(src_dir)
 
-    if opts["do_compile"]:
-        compiled_version = opts["compiled_version"]
+    if opts['do_compile']:
+        compiled_version = opts['compiled_version']
         if compiled_version and PYTHON_VERSION != compiled_version:
-            print(
-                "Not compiling: desired Python version is %s but we are running %s"
-                % (compiled_version, PYTHON_VERSION),
-                file=sys.stderr,
-            )
+            sys.stderr.write("Not compiling: "
+                             "desired Python version is %s "
+                             "but we are running %s" %
+                             (compiled_version, PYTHON_VERSION))
         else:
             for root, dirs, basenames in os.walk(src_dir):
                 file_matches(files, root, basenames, PY)
@@ -169,36 +143,34 @@ def do_tests(src_dir, obj_patterns, target_dir, opts):
             pass
         pass
 
-    for root, dirs, basenames in os.walk("."):
+    for root, dirs, basenames in os.walk('.'):
         # Turn root into a relative path
         dirname = root[2:]  # 2 = len('.') + 1
         file_matches(files, dirname, basenames, obj_patterns)
 
     if not files:
-        print(
-            "Didn't come up with any files to test! Try with --compile?",
-            file=sys.stderr,
-        )
+        sys.stderr.write("Didn't come up with any files to test! "
+                         "Try with --compile?")
         exit(1)
 
     os.chdir(cwd)
     files.sort()
 
-    if opts["start_with"]:
+    if opts['start_with']:
         try:
-            start_with = files.index(opts["start_with"])
+            start_with = files.index(opts['start_with'])
             files = files[start_with:]
-            print(">>> starting with file", files[0])
+            print('>>> starting with file', files[0])
         except ValueError:
             pass
 
-    print(time.ctime())
-    print("Source directory: ", src_dir)
-    print("Output directory: ", target_dir)
+    print time.ctime()
+    print 'Source directory: ', src_dir
+    print 'Output directory: ', target_dir
     try:
-        _, _, failed_files, failed_verify = main(
-            src_dir, target_dir, files, [], do_verify=opts["do_verify"]
-        )
+        _, _, failed_files, failed_verify = \
+          main(src_dir, target_dir, files, [],
+               do_verify=opts['do_verify'])
         if failed_files != 0:
             sys.exit(2)
         elif failed_verify != 0:
@@ -207,90 +179,79 @@ def do_tests(src_dir, obj_patterns, target_dir, opts):
     except (KeyboardInterrupt, OSError):
         print()
         sys.exit(1)
-    if test_opts["rmtree"]:
+    if test_opts['rmtree']:
         parent_dir = os.path.dirname(target_dir)
         print("Everything good, removing %s" % parent_dir)
         shutil.rmtree(parent_dir)
 
-
-if __name__ == "__main__":
+if __name__ == '__main__':
     test_dirs = []
     checked_dirs = []
     start_with = None
 
     test_options_keys = list(test_options.keys())
     test_options_keys.sort()
-    opts, args = getopt.getopt(
-        sys.argv[1:],
-        "",
-        [
-            "start-with=",
-            "verify",
-            "verify-run",
-            "syntax-verify",
-            "all",
-            "compile",
-            "coverage",
-            "no-rm",
-        ]
-        + test_options_keys,
-    )
-    if not opts:
-        help()
+    opts, args = getopt.getopt(sys.argv[1:], '',
+                               ['start-with=', 'verify', 'verify-run',
+                                'syntax-verify', 'all',
+                                'compile', 'coverage',
+                                'no-rm'] \
+                               + test_options_keys )
+    if not opts: help()
 
     test_opts = {
-        "do_compile": False,
-        "do_verify": False,
-        "start_with": None,
-        "rmtree": True,
-        "coverage": False,
-    }
+        'do_compile': False,
+        'do_verify': False,
+        'start_with': None,
+        'rmtree' : True,
+        'coverage' : False
+        }
 
     for opt, val in opts:
-        if opt == "--verify":
-            test_opts["do_verify"] = "strong"
-        elif opt == "--syntax-verify":
-            test_opts["do_verify"] = "weak"
-        elif opt == "--verify-run":
-            test_opts["do_verify"] = "verify-run"
-        elif opt == "--compile":
-            test_opts["do_compile"] = True
-        elif opt == "--start-with":
-            test_opts["start_with"] = val
-        elif opt == "--no-rm":
-            test_opts["rmtree"] = False
+        if opt == '--verify':
+            test_opts['do_verify'] = 'strong'
+        elif opt == '--syntax-verify':
+            test_opts['do_verify'] = 'weak'
+        elif opt == '--verify-run':
+            test_opts['do_verify'] = 'verify-run'
+        elif opt == '--compile':
+            test_opts['do_compile'] = True
+        elif opt == '--start-with':
+            test_opts['start_with'] = val
+        elif opt == '--no-rm':
+            test_opts['rmtree'] = False
         elif opt[2:] in test_options_keys:
             test_dirs.append(test_options[opt[2:]])
-        elif opt == "--all":
+        elif opt == '--all':
             for val in test_options_keys:
                 test_dirs.append(test_options[val])
-        elif opt == "--coverage":
-            test_opts["coverage"] = True
+        elif opt == '--coverage':
+            test_opts['coverage'] = True
         else:
             help()
             pass
         pass
 
-    if test_opts["coverage"]:
-        os.environ["SPARK_PARSER_COVERAGE"] = (
-            "/tmp/spark-grammar-python-lib%s.cover" % test_dirs[0][-1]
-        )
+    if test_opts['coverage']:
+        os.environ['SPARK_PARSER_COVERAGE'] = (
+            '/tmp/spark-grammar-python-lib%s.cover' % test_dirs[0][-1]
+            )
 
     last_compile_version = None
     for src_dir, pattern, target_dir, compiled_version in test_dirs:
         if os.path.isdir(src_dir):
             checked_dirs.append([src_dir, pattern, target_dir])
         else:
-            print("Can't find directory %s. Skipping" % src_dir, file=sys.stderr)
+            sys.stderr.write("Can't find directory %s. Skipping" % src_dir)
             continue
         last_compile_version = compiled_version
         pass
 
     if not checked_dirs:
-        print("No directories found to check", file=sys.stderr)
+        sys.stderr.write("No directories found to check\n")
         sys.exit(1)
 
-    test_opts["compiled_version"] = last_compile_version
+    test_opts['compiled_version'] = last_compile_version
 
     for src_dir, pattern, target_dir in checked_dirs:
         target_dir = os.path.join(target_base, target_dir)

uncompyle6/.gitignore

@@ -0,0 +1 @@
+/.python-version

uncompyle6/bin/pydisassemble.py

@@ -3,7 +3,6 @@
 #
 # Copyright (c) 2015-2016, 2018 by Rocky Bernstein <rb@dustyfeet.com>
 #
-from __future__ import print_function
 import sys, os, getopt
 
 from uncompyle6.disas import disassemble_file
@@ -13,8 +12,8 @@ program, ext = os.path.splitext(os.path.basename(__file__))
 
 __doc__ = """
 Usage:
-  {0} [OPTIONS]... FILE
-  {0} [--help | -h | -V | --version]
+  %s [OPTIONS]... FILE
+  %s [--help | -h | -V | --version]
 
 Disassemble FILE with the instruction mangling that is done to
 assist uncompyle6 in parsing the instruction stream. For example
@@ -23,9 +22,9 @@ BUILD_LIST have arguement counts appended to the instruction name, and
 COME_FROM instructions are inserted into the instruction stream.
 
 Examples:
-  {0} foo.pyc
-  {0} foo.py    # same thing as above but find the file
-  {0} foo.pyc bar.pyc  # disassemble foo.pyc and bar.pyc
+  %s foo.pyc
+  %s foo.py    # same thing as above but find the file
+  %s foo.pyc bar.pyc  # disassemble foo.pyc and bar.pyc
 
 See also `pydisasm' from the `xdis' package.
 
@@ -33,7 +32,7 @@ Options:
   -V | --version     show version and stop
   -h | --help        show this message
 
-""".format(program)
+""" % ((program,) * 5)
 
 PATTERNS = ('*.pyc', '*.pyo')
 
@@ -42,15 +41,15 @@ def main():
 Type -h for for full help.""" % program
 
     if len(sys.argv) == 1:
-        print("No file(s) given", file=sys.stderr)
-        print(Usage_short, file=sys.stderr)
+        sys.stderr.write("No file(s) given\n")
+        sys.stderr.write(Usage_short)
         sys.exit(1)
 
     try:
         opts, files = getopt.getopt(sys.argv[1:], 'hVU',
                                     ['help', 'version', 'uncompyle6'])
-    except getopt.GetoptError as e:
-        print('%s: %s' % (os.path.basename(sys.argv[0]), e),  file=sys.stderr)
+    except getopt.GetoptError(e):
+        sys.stderr.write('%s: %s' % (os.path.basename(sys.argv[0]), e))
         sys.exit(-1)
 
     for opt, val in opts:
@@ -62,15 +61,14 @@ Type -h for for full help.""" % program
             sys.exit(0)
         else:
             print(opt)
-            print(Usage_short, file=sys.stderr)
+            sys.stderr.write(Usage_short)
             sys.exit(1)
 
     for file in files:
         if os.path.exists(files[0]):
             disassemble_file(file, sys.stdout)
         else:
-            print("Can't read %s - skipping" % files[0],
-                  file=sys.stderr)
+            sys.stderr.write("Can't read %s - skipping\n" % files[0])
             pass
         pass
     return

uncompyle6/bin/uncompile.py

@@ -4,7 +4,6 @@
 # Copyright (c) 2015-2017, 2019 by Rocky Bernstein
 # Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com>
 #
-from __future__ import print_function
 import sys, os, getopt, time
 
 program = 'uncompyle6'
@@ -46,12 +45,10 @@ Options:
   --help        show this message
 
 Debugging Options:
-  --asm     | -a        include byte-code       (disables --verify)
-  --grammar | -g        show matching grammar
-  --tree={before|after}
-  -t {before|after}     include syntax before (or after) tree transformation
-                        (disables --verify)
-  --tree++ | -T         add template rules to --tree=before when possible
+  --asm     | -a  include byte-code       (disables --verify)
+  --grammar | -g  show matching grammar
+  --tree    | -t  include syntax tree     (disables --verify)
+  --tree++        add template rules to --tree when possible
 
 Extensions of generated files:
   '.pyc_dis' '.pyo_dis'   successfully decompiled (and verified if --verify)
@@ -71,13 +68,9 @@ def usage():
 
 
 def main_bin():
-    if not (sys.version_info[0:2] in ((2, 6), (2, 7), (3, 0),
-                                      (3, 1), (3, 2), (3, 3),
-                                      (3, 4), (3, 5), (3, 6),
-                                      (3, 7), (3, 8)
-        )):
-        print('Error: %s requires Python 2.6-3.8' % program,
-              file=sys.stderr)
+    if not (sys.version_info[0:2] in ((2, 4), (2, 5), (2, 6), (2, 7))):
+        sys.stderr.write('Error: this branch of %s requires Python 2.4, 2.5, 2.6 or 2.7'
+                         % program)
         sys.exit(-1)
 
     do_verify = recurse_dirs = False
@@ -91,12 +84,13 @@ def main_bin():
     try:
         opts, pyc_paths = getopt.getopt(sys.argv[1:], 'hac:gtTdrVo:p:',
                                     'help asm compile= grammar linemaps recurse '
-                                    'timestamp tree= tree+ '
+                                    'timestamp tree tree+ '
                                     'fragments verify verify-run version '
                                     'syntax-verify '
                                     'showgrammar encoding='.split(' '))
-    except getopt.GetoptError as e:
-        print('%s: %s' % (os.path.basename(sys.argv[0]), e),  file=sys.stderr)
+    except getopt.GetoptError, e:
+        sys.stderr.write('%s: %s\n' %
+                         (os.path.basename(sys.argv[0]), e))
         sys.exit(-1)
 
     options = {}
@@ -121,19 +115,10 @@ def main_bin():
             options['showasm'] = 'after'
             options['do_verify'] = None
         elif opt in ('--tree', '-t'):
-            if 'showast' not in options:
-                options['showast'] = {}
-            if val == 'before':
-                options['showast'][val] = True
-            elif val == 'after':
-                options['showast'][val] = True
-            else:
-                options['showast']['before'] = True
+            options['showast'] = True
             options['do_verify'] = None
         elif opt in ('--tree+', '-T'):
-            if 'showast' not in options:
-                options['showast'] = {}
-            options['showast']['Full'] = True
+            options['showast'] = 'Full'
             options['do_verify'] = None
         elif opt in ('--grammar', '-g'):
             options['showgrammar'] = True
@@ -150,7 +135,7 @@ def main_bin():
         elif opt == '--encoding':
             options['source_encoding'] = val
         else:
-            print(opt, file=sys.stderr)
+            sys.stderr.write(opt)
             usage()
 
     # expand directory if specified
@@ -174,8 +159,8 @@ def main_bin():
         sb_len = len( os.path.join(src_base, '') )
         pyc_paths = [f[sb_len:] for f in pyc_paths]
 
-    if not pyc_paths and not source_paths:
-        print("No input files given to decompile", file=sys.stderr)
+    if not pyc_paths:
+        sys.stderr.write("No files given\n")
         usage()
 
     if outfile == '-':

uncompyle6/disas.py

@@ -29,8 +29,6 @@ Second, we need structured instruction information for the
 want to run on earlier Python versions.
 """
 
-from __future__ import print_function
-
 import sys
 from collections import deque
 
@@ -49,10 +47,9 @@ def disco(version, co, out=None, is_pypy=False):
 
     # store final output stream for case of error
     real_out = out or sys.stdout
-    print('# Python %s' % version, file=real_out)
+    real_out.write('# Python %s\n' % version)
     if co.co_filename:
-        print('# Embedded file name: %s' % co.co_filename,
-              file=real_out)
+        real_out.write('# Embedded file name: %s\n' % co.co_filename)
 
     scanner = get_scanner(version, is_pypy=is_pypy)
 
@@ -64,16 +61,15 @@ def disco_loop(disasm, queue, real_out):
     while len(queue) > 0:
         co = queue.popleft()
         if co.co_name != '<module>':
-            print('\n# %s line %d of %s' %
-                      (co.co_name, co.co_firstlineno, co.co_filename),
-                      file=real_out)
+            real_out.write('\n# %s line %d of %s\n' %
+                      (co.co_name, co.co_firstlineno, co.co_filename))
         tokens, customize = disasm(co)
         for t in tokens:
             if iscode(t.pattr):
                 queue.append(t.pattr)
             elif iscode(t.attr):
                 queue.append(t.attr)
-            print(t, file=real_out)
+            real_out.write(t)
             pass
         pass
 

uncompyle6/linenumbers.py

@@ -25,7 +25,7 @@ def line_number_mapping(pyc_filename, src_filename):
      source_size) = load_module(pyc_filename)
     try:
         code2 = load_file(src_filename)
-    except SyntaxError as e:
+    except SyntaxError, e:
         return str(e)
 
     queue = deque([code1, code2])

uncompyle6/main.py

@@ -12,8 +12,7 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
-import datetime, py_compile, os, subprocess, sys, tempfile
+import datetime, os, subprocess, sys
 
 from uncompyle6 import verify, IS_PYPY, PYTHON_VERSION
 from xdis.code import iscode
@@ -39,27 +38,13 @@ def _get_outstream(outfile):
         os.makedirs(dir)
     except OSError:
         pass
-    if PYTHON_VERSION < 3.0:
-        return open(outfile, mode='wb')
-    else:
-        return open(outfile, mode='w', encoding='utf-8')
+    return open(outfile, 'wb')
 
 def decompile(
-    bytecode_version,
-    co,
-    out=None,
-    showasm=None,
-    showast={},
-    timestamp=None,
-    showgrammar=False,
-    source_encoding=None,
-    code_objects={},
-    source_size=None,
-    is_pypy=None,
-    magic_int=None,
-    mapstream=None,
-    do_fragments=False,
-):
+        bytecode_version, co, out=None, showasm=None, showast=False,
+        timestamp=None, showgrammar=False, source_encoding=None, code_objects={},
+        source_size=None, is_pypy=None, magic_int=None,
+        mapstream=None, do_fragments=False):
     """
     ingests and deparses a given code block 'co'
 
@@ -80,22 +65,37 @@ def decompile(
 
     assert iscode(co)
 
-    co_pypy_str = 'PyPy ' if is_pypy else ''
-    run_pypy_str = 'PyPy ' if IS_PYPY else ''
+    if is_pypy:
+        co_pypy_str = 'PyPy '
+    else:
+        co_pypy_str = ''
+
+    if IS_PYPY:
+        run_pypy_str = 'PyPy '
+    else:
+        run_pypy_str = ''
+
+    if magic_int:
+        m = str(magic_int)
+    else:
+        m = ""
+
     sys_version_lines = sys.version.split('\n')
     if source_encoding:
         write('# -*- coding: %s -*-' % source_encoding)
     write('# uncompyle6 version %s\n'
           '# %sPython bytecode %s%s\n# Decompiled from: %sPython %s' %
           (VERSION, co_pypy_str, bytecode_version,
-               " (%s)" % str(magic_int) if magic_int else "",
-          run_pypy_str, '\n# '.join(sys_version_lines)))
+               " (%s)" % m, run_pypy_str,
+           '\n# '.join(sys_version_lines)))
     if co.co_filename:
         write('# Embedded file name: %s' % co.co_filename,)
     if timestamp:
-        write('# Compiled at: %s' % datetime.datetime.fromtimestamp(timestamp))
+        write('# Compiled at: %s' %
+              datetime.datetime.fromtimestamp(timestamp))
     if source_size:
-        write('# Size of source mod 2**32: %d bytes' % source_size)
+        real_out.write('# Size of source mod 2**32: %d bytes\n' %
+                       source_size)
 
     debug_opts = {
         'asm': showasm,
@@ -128,7 +128,7 @@ def decompile(
                                   is_pypy=is_pypy)
             pass
         return deparsed
-    except pysource.SourceWalkerError as e:
+    except pysource.SourceWalkerError, e:
         # deparsing failed
         raise pysource.SourceWalkerError(str(e))
 
@@ -227,22 +227,16 @@ def main(in_base, out_base, compiled_files, source_files, outfile=None,
                     prefix = prefix[:-len('.py')]
 
                 # Unbuffer output if possible
-                buffering = -1 if sys.stdout.isatty() else 0
-                if PYTHON_VERSION >= 3.5:
-                    t = tempfile.NamedTemporaryFile(mode='w+b',
-                                                    buffering=buffering,
-                                                    suffix='.py',
-                                                    prefix=prefix)
+                if sys.stdout.isatty():
+                    buffering = -1
                 else:
-                    t = tempfile.NamedTemporaryFile(mode='w+b',
-                                                    suffix='.py',
-                                                    prefix=prefix)
-                current_outfile = t.name
+                    buffering = 0
                 sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', buffering)
-                tee = subprocess.Popen(["tee", current_outfile],
-                                       stdin=subprocess.PIPE)
-                os.dup2(tee.stdin.fileno(), sys.stdout.fileno())
-                os.dup2(tee.stdin.fileno(), sys.stderr.fileno())
+                if PYTHON_VERSION > 2.5:
+                    tee = subprocess.Popen(["tee", current_outfile],
+                                           stdin=subprocess.PIPE)
+                    os.dup2(tee.stdin.fileno(), sys.stdout.fileno())
+                    os.dup2(tee.stdin.fileno(), sys.stderr.fileno())
         else:
             if filename.endswith('.pyc'):
                 current_outfile = os.path.join(out_base, filename[0:-1])
@@ -276,9 +270,9 @@ def main(in_base, out_base, compiled_files, source_files, outfile=None,
                     pass
                 pass
             tot_files += 1
-        except (ValueError, SyntaxError, ParserError, pysource.SourceWalkerError) as e:
+        except (ValueError, SyntaxError, ParserError, pysource.SourceWalkerError):
             sys.stdout.write("\n")
-            sys.stderr.write("\n# file %s\n# %s\n" % (infile, e))
+            sys.stderr.write("# file %s\n" % (infile))
             failed_files += 1
             tot_files += 1
         except KeyboardInterrupt:
@@ -288,7 +282,7 @@ def main(in_base, out_base, compiled_files, source_files, outfile=None,
             sys.stdout.write("\n")
             sys.stderr.write("\nLast file: %s   " % (infile))
             raise
-        except RuntimeError as e:
+        except RuntimeError, e:
             sys.stdout.write("\n%s\n" % str(e))
             if str(e).startswith('Unsupported Python'):
                 sys.stdout.write("\n")
@@ -305,7 +299,7 @@ def main(in_base, out_base, compiled_files, source_files, outfile=None,
         #     failed_files += 1
         #     if current_outfile:
         #         outstream.close()
-        #         os.rename(current_outfile, current_outfile + "_failed")
+        #         os.rename(current_outfile, current_outfile + '_failed')
         #     else:
         #         sys.stderr.write("\n# %s" % sys.exc_info()[1])
         #         sys.stderr.write("\n# Can't uncompile %s\n" % infile)
@@ -329,13 +323,16 @@ def main(in_base, out_base, compiled_files, source_files, outfile=None,
                         else:
                             okay_files += 1
                             pass
-                    except verify.VerifyCmpError as e:
+                    except verify.VerifyCmpError, e:
                         print(e)
                         verify_failed_files += 1
                         os.rename(current_outfile, current_outfile + '_unverified')
                         sys.stderr.write("### Error Verifying %s\n" % filename)
                         sys.stderr.write(str(e) + "\n")
                         if not outfile:
+                            sys.stderr.write("### Error Verifiying %s" %
+                                            filename)
+                            sys.stderr.write(e)
                             if raise_on_error:
                                 raise
                             pass
@@ -345,14 +342,15 @@ def main(in_base, out_base, compiled_files, source_files, outfile=None,
                     okay_files += 1
                 pass
             elif do_verify:
-                sys.stderr.write("\n### uncompile successful, but no file to compare against\n")
+                sys.stderr.write("\n### uncompile successful, "
+                                 "but no file to compare against")
                 pass
             else:
                 okay_files += 1
                 if not current_outfile:
                     mess = '\n# okay decompiling'
                     # mem_usage = __memUsage()
-                    print(mess, infile)
+                    print mess, infile
         if current_outfile:
             sys.stdout.write("%s -- %s\r" %
                              (infile, status_msg(do_verify, tot_files, okay_files, failed_files,

uncompyle6/parser.py

@@ -19,8 +19,6 @@
 Common uncompyle6 parser routines.
 """
 
-from __future__ import print_function
-
 import sys
 
 from xdis.code import iscode
@@ -187,7 +185,7 @@ class PythonParser(GenericASTBuilder):
                     indent = '   '
                 else:
                     indent = '-> '
-                print("%s%s" % (indent, instructions[i]))
+                print "%s%s" % (indent, instructions[i])
             raise ParserError(err_token, err_token.offset)
         else:
             raise ParserError(None, -1)
@@ -807,4 +805,4 @@ if __name__ == '__main__':
         ast = python_parser(PYTHON_VERSION, co, showasm=True, is_pypy=IS_PYPY)
         print(ast)
         return
-    parse_test(parse_test.__code__)
+    # parse_test(parse_test.__code__)

uncompyle6/parsers/parse2.py

@@ -25,8 +25,6 @@ If we succeed in creating a parse tree, then we have a Python program
 that a later phase can turn into a sequence of ASCII text.
 """
 
-from __future__ import print_function
-
 from uncompyle6.parser import PythonParser, PythonParserSingle, nop_func
 from uncompyle6.parsers.treenode import SyntaxTree
 from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG

uncompyle6/parsers/parse24.py

@@ -87,15 +87,6 @@ class Python24Parser(Python25Parser):
             l = len(tokens)
             if 0 <= l < len(tokens):
                 return not int(tokens[first].pattr) == tokens[last].offset
-        elif lhs == 'try_except':
-            if last == len(tokens):
-                last -= 1
-            if tokens[last] != 'COME_FROM' and tokens[last-1] == 'COME_FROM':
-                last -= 1
-            return (tokens[last] == 'COME_FROM'
-                    and tokens[last-1] == 'END_FINALLY'
-                    and tokens[last-2] == 'POP_TOP'
-                    and tokens[last-3].kind != 'JUMP_FORWARD')
 
         return False
 

uncompyle6/parsers/parse25.py

@@ -19,6 +19,9 @@ class Python25Parser(Python26Parser):
 
         return_if_stmt ::= ret_expr  RETURN_END_IF JUMP_BACK
 
+        # We have no jumps to jumps, so no "come_froms" but a single "COME_FROM"
+        ifelsestmt ::= testexpr c_stmts_opt jf_cf_pop else_suite COME_FROM
+
         # Python 2.6 uses ROT_TWO instead of the STORE_xxx
         # withas is allowed as a "from future" in 2.5
         # 2.6 and 2.7 do something slightly different
@@ -36,6 +39,8 @@ class Python25Parser(Python26Parser):
         # loop. FIXME: should "come_froms" below be a single COME_FROM?
         tryelsestmt    ::= SETUP_EXCEPT suite_stmts_opt POP_BLOCK
                            except_handler else_suite come_froms
+        tryelsestmtl   ::= SETUP_EXCEPT suite_stmts_opt POP_BLOCK
+                            except_handler else_suitel
 
         # Python 2.6 omits the LOAD_FAST DELETE_FAST below
         # withas is allowed as a "from future" in 2.5
@@ -54,6 +59,9 @@ class Python25Parser(Python26Parser):
     def customize_grammar_rules(self, tokens, customize):
         # Remove grammar rules inherited from Python 2.6 or Python 2
         self.remove_rules("""
+        # No jump to jumps in 2.4 so we have a single "COME_FROM", not "come_froms"
+        ifelsestmt    ::= testexpr c_stmts_opt jf_cf_pop else_suite come_froms
+
         setupwith  ::= DUP_TOP LOAD_ATTR ROT_TWO LOAD_ATTR CALL_FUNCTION_0 POP_TOP
         withstmt   ::= expr setupwith SETUP_FINALLY suite_stmts_opt
                        POP_BLOCK LOAD_CONST COME_FROM WITH_CLEANUP END_FINALLY

uncompyle6/parsers/parse26.py

@@ -146,11 +146,6 @@ class Python26Parser(Python2Parser):
         whilestmt      ::= SETUP_LOOP testexpr l_stmts_opt jb_cf_pop POP_BLOCK
         whilestmt      ::= SETUP_LOOP testexpr returns POP_BLOCK COME_FROM
 
-        # In the "whilestmt" below, there isn't a COME_FROM when the
-        # "while" is the last thing in the module or function.
-
-        whilestmt      ::= SETUP_LOOP testexpr returns POP_TOP POP_BLOCK
-
         whileelsestmt  ::= SETUP_LOOP testexpr l_stmts_opt jb_pop POP_BLOCK
                            else_suitel COME_FROM
         while1elsestmt ::= SETUP_LOOP l_stmts JUMP_BACK else_suitel COME_FROM
@@ -191,11 +186,7 @@ class Python26Parser(Python2Parser):
         jmp_false_then ::= JUMP_IF_FALSE THEN POP_TOP
         jmp_true_then  ::= JUMP_IF_TRUE THEN POP_TOP
 
-        # In the "while1stmt" below, there sometimes isn't a
-        # "COME_FROM" when the "while1" is the last thing in the
-        # module or function.
-
-        while1stmt ::= SETUP_LOOP returns come_from_opt
+        while1stmt ::= SETUP_LOOP returns COME_FROM
         for_block  ::= returns _come_froms
         """
 
@@ -250,9 +241,6 @@ class Python26Parser(Python2Parser):
         genexpr_func ::= setup_loop_lf FOR_ITER store comp_iter JUMP_ABSOLUTE come_froms
                          POP_TOP jb_pop jb_pb_come_from
 
-        genexpr_func ::= setup_loop_lf FOR_ITER store comp_iter JUMP_BACK come_froms
-                         POP_TOP jb_pb_come_from
-
         generator_exp ::= LOAD_GENEXPR MAKE_FUNCTION_0 expr GET_ITER CALL_FUNCTION_1 COME_FROM
         list_if ::= list_if ::= expr jmp_false_then list_iter
         '''

uncompyle6/parsers/parse27.py

@@ -310,4 +310,5 @@ if __name__ == '__main__':
                              for t in remain_tokens])
         remain_tokens = set(remain_tokens) - opcode_set
         print(remain_tokens)
-        # p.dump_grammar()
+        p.check_grammar()
+        p.dump_grammar()

uncompyle6/parsers/parse3.py

@@ -445,7 +445,8 @@ class Python3Parser(PythonParser):
          """
         # FIXME: I bet this can be simplified
         # look for next MAKE_FUNCTION
-        for i in range(i + 1, len(tokens)):
+        j = i
+        for i in range(j + 1, len(tokens)):
             if tokens[i].kind.startswith("MAKE_FUNCTION"):
                 break
             elif tokens[i].kind.startswith("MAKE_CLOSURE"):
@@ -457,6 +458,7 @@ class Python3Parser(PythonParser):
         assert (
             tokens[i + 1].kind == "LOAD_STR"
         ), "build_class expecting CONST after MAKE_FUNCTION/MAKE_CLOSURE"
+
         call_fn_tok = None
         for i in range(i, len(tokens)):
             if tokens[i].kind.startswith("CALL_FUNCTION"):
@@ -825,7 +827,7 @@ class Python3Parser(PythonParser):
                 # Note: don't add to custom_ops_processed.
 
             elif opname_base == "CALL_METHOD":
-                # PyPy and Python 3.7+ only - DRY with parse2
+                # PyPy only - DRY with parse2
 
                 args_pos, args_kw = self.get_pos_kw(token)
 

uncompyle6/parsers/parse30.py

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

uncompyle6/parsers/parse31.py

@@ -2,7 +2,6 @@
 """
 spark grammar differences over Python 3.2 for Python 3.1.
 """
-from __future__ import print_function
 
 from uncompyle6.parser import PythonParserSingle
 from uncompyle6.parsers.parse32 import Python32Parser

uncompyle6/parsers/parse32.py

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