Old egg build tolerance

in scanner2's "continue" detection

.circleci/config.yml

@@ -1,10 +1,9 @@
 version: 2
 filters:
   branches:
-    only: master
+    only: python-2.4
 jobs:
   build:
-    working_directory: ~/rocky/python-uncompyle6
     parallelism: 1
     shell: /bin/bash --login
     # CircleCI 2.0 does not support environment variables that refer to each other the same way as 1.0 did.
@@ -16,7 +15,7 @@ jobs:
     # To see the list of pre-built images that CircleCI provides for most common languages see
     # https://circleci.com/docs/2.0/circleci-images/
     docker:
-      - image: circleci/python:3.6.9
+      - image: circleci/python:2.7
     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
@@ -26,10 +25,6 @@ jobs:
     # In many cases you can simplify this from what is generated here.
     # 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/'
     - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
-    # This is based on your 1.0 configuration file or project settings
-    - run:
-        working_directory: ~/rocky/python-uncompyle6
-        command: pip install --user virtualenv && pip install --user nose && pip install --user pep8
     # Dependencies
     #   This would typically go in either a build or a build-and-test job when using workflows
     # Restore the dependency cache
@@ -41,11 +36,11 @@ jobs:
 
     - run:
         command: | # Use pip to install dependengcies
-          pip install --user --upgrade setuptools
-          # Until the next release
-          pip install git+https://github.com/rocky/python-xdis#egg=xdis
-          pip install --user -e .
-          pip install --user -r requirements-dev.txt
+          sudo easy_install click==7.1.2
+          # Until next release use github xdis
+          sudo pip install git+https://github.com/rocky/python-xdis@python-2.34to-2.7#egg=xdis
+          sudo pip install -e .
+          sudo pip install -r requirements-dev.txt
 
     # Save dependency cache
     - save_cache:
@@ -63,8 +58,8 @@ jobs:
     # 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: sudo python ./setup.py develop && make check-3.6
-    - run: cd ./test/stdlib && bash ./runtests.sh 'test_[p-z]*.py'
+    - run: sudo python ./setup.py develop && make check-2.7
+    - run: cd test/stdlib && bash ./runtests.sh 'test_[p-z]*.py'
     # Teardown
     #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
     # Save test results

.github/workflows/osx.yml

@@ -1,31 +0,0 @@
-name: uncompyle6 (osx)
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        os: [macOS]
-        python-version: [3.7, 3.8]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        # Until the next xdis release
-        pip install git+https://github.com/rocky/python-xdis#egg=xdis
-        pip install -e .
-        pip install -r requirements-dev.txt
-    - name: Test uncompyle6
-      run: |
-        make check

.github/workflows/ubuntu.yml

@@ -1,30 +0,0 @@
-name: uncompyle6 (ubuntu)
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.7, 3.8]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        # Until the next xdis release
-        pip install git+https://github.com/rocky/python-xdis#egg=xdis
-        pip install -e .
-        pip install -r requirements-dev.txt
-    - name: Test uncompyle6
-      run: |
-        make check

.github/workflows/windows.yml

@@ -1,31 +0,0 @@
-name: uncompyle6 (windows)
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        os: [windows]
-        python-version: [3.7, 3.8]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        # Until the next xdis release
-        pip install git+https://github.com/rocky/python-xdis#egg=xdis
-        pip install -e .
-        pip install -r requirements-dev.txt
-    - name: Test uncompyle6
-      run: |
-        make check

.travis.yml

@@ -1,16 +1,7 @@
 language: python
 
 python:
-#  - '3.5'
-#  - '2.7'
-#  - '3.4'
-  - '3.6'
-  - '3.8'
-
-matrix:
-  include:
-    - python: '3.7'
-      dist: xenial  # required for Python >= 3.7 (travis-ci/travis-ci#9069)
+  - 2.7 # this is a cheat here because travis doesn't do 2.4-2.6
 
 install:
 # Remove the next line when xdis 6.0.0 is released

Makefile

@@ -43,8 +43,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,4 +1,26 @@
-3.8.0: 2020-10-29
+3.9.0: 2022-12-22
+=================
+
+* deparse generator expressions for Python 3.0 .. 3.2
+* Python 3.0 list comprehension.
+* Fix Issues #310, #344, #377, #391, #409, #414
+* Limited support for 3.8+ f-string "=" specifier
+* Correct 2.5-7 relative import formatting
+* Miscellaneous bug fixing
+* remove \n in lambda
+* Python 2.6 gramar cleanup
+* Correct some Python 2.6 chain compare decompilation
+* Ensure no parenthesis subscript slices
+* Correct 2.x formatting "slice2" nonterminal
+* Correct 3.7 imports
+* Improve "async for" parsing
+* Handle BUILD_MAP opcode
+* match Python AT better
+* Correct 3.7 positional args
+* PyPy 3.7 and PyPy 3.8 support
+* Miscellaneous linting, isorting, blacking
+
+3.8.0: 2021-10-29
 =================
 
 * Better handling of invalid bytecode magic

README.rst

@@ -103,16 +103,16 @@ Installation
 
 You can install from PyPI using the name ``uncompyle6``::
 
-    pip install uncompyle6
+   $ pip install uncompyle6
 
 
 To install from source code, this project uses setup.py, so it follows the standard Python routine::
 
-    $ pip install -e .  # set up to run from source tree
+   $ pip install -e .  # set up to run from source tree
 
 or::
 
-    $ python setup.py install # may need sudo
+   $ python setup.py install # may need sudo
 
 A GNU Makefile is also provided so :code:`make install` (possibly as root or
 sudo) will do the steps above.
@@ -122,7 +122,7 @@ Running Tests
 
 ::
 
-   make check
+   $  make check
 
 A GNU makefile has been added to smooth over setting running the right
 command, and running tests from fastest to slowest.
@@ -303,15 +303,12 @@ See Also
 .. _uncompyle2: https://github.com/wibiti/uncompyle2
 .. _unpyc37: https://github.com/andrew-tavera/unpyc37
 .. _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
+.. |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
 .. _pydecipher: https://github.com/mitre/pydecipher
 .. _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
+.. |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

admin-tools/check-2.4-2.7-versions.sh

@@ -20,8 +20,9 @@ for version in $PYVERSIONS; do
 	exit $?
     fi
     make clean && python setup.py develop
-    if ! make check ; then
+    if ! make check-short ; then
 	exit $?
     fi
     echo === $version ===
 done
+make check

admin-tools/check-3.3-3.5-versions.sh

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

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-3.3-3.5-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.5.10 3.3.7 3.4.10'
+export PYVERSIONS=' 3.3.7 3.4.10 3.5.10 '

admin-tools/pyenv-newest-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.15 pypy3.6-7.3.1 3.7.16 pypy-3.7-3.9 pypy3.8-7.3.10 pyston-2.3.5 3.8.14'
+export PYVERSIONS='3.6.15 pypy3.6-7.3.1 3.7.16 pypy-3.7-7.3.9 pypy3.8-7.3.10 pyston-2.3.5 3.8.16'

admin-tools/update-sources.sh

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

pytest/test_deparse.py

@@ -29,7 +29,7 @@ def list_comp():
     [y for y in range(3)]
 
 def get_parsed_for_fn(fn):
-    code = fn.__code__
+    code = fn.func_code
     return deparse(code, version=PYTHON_VERSION_TRIPLE)
 
 def check_expect(expect, parsed, fn_name):
@@ -316,3 +316,4 @@ for i in range(2): ...
 .
 """.split("\n")
     parsed = get_parsed_for_fn(for_range_stmt)
+    check_expect(expect, parsed, 'range_stmt')

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_TRIPLE)
     if (2, 7) <= PYTHON_VERSION_TRIPLE < (3, 1) and not IS_PYPY:
         scan.build_instructions(code)

pytest/test_grammar.py

@@ -45,28 +45,31 @@ def test_grammar():
         expect_lhs.add("kvlist")
         expect_lhs.add("kv3")
         unused_rhs.add("dict")
-
-        if PYTHON_VERSION_TRIPLE < (3, 7) and PYTHON_VERSION_TRIPLE[:2] != (2, 7):
+    else:
+        if PYTHON_VERSION_TRIPLE < (3, 7) and PYTHON_VERSION_TRIPLE[:2] not in ((2, 7), (2, 6)):
             # NOTE: this may disappear
             expect_lhs.add("except_handler_else")
 
-    expect_lhs.add("load_genexpr")
+    expect_lhs.add("kwarg")
+    if PYTHON_VERSION_TRIPLE >= (3, 0):
+        expect_lhs.add("load_genexpr")
 
-    unused_rhs = unused_rhs.union(
-        set(
-            """
-    except_pop_except generator_exp
-    """.split()
+        unused_rhs = unused_rhs.union(
+            set(
+                """
+        except_pop_except generator_exp
+        """.split()
+            )
         )
-    )
-    if PYTHON_VERSION_TRIPLE < (3, 7):
-        expect_lhs.add("annotate_arg")
-        expect_lhs.add("annotate_tuple")
-        unused_rhs.add("mkfunc_annotate")
+        if PYTHON_VERSION_TRIPLE < (3, 7):
+            expect_lhs.add("annotate_arg")
+            expect_lhs.add("annotate_tuple")
+            unused_rhs.add("mkfunc_annotate")
+
+            unused_rhs.add("dict_comp")
+            unused_rhs.add("classdefdeco1")
+            unused_rhs.add("tryelsestmtl")
 
-    unused_rhs.add("dict_comp")
-    unused_rhs.add("classdefdeco1")
-    unused_rhs.add("tryelsestmtl")
     if PYTHON_VERSION_TRIPLE >= (3, 5):
         expect_right_recursive.add(
             (("l_stmts", ("lastl_stmt", "come_froms", "l_stmts")))

pytest/test_pysource.py-notyet

@@ -5,9 +5,7 @@ from uncompyle6.semantics.consts import (
     # RETURN_NONE, PASS, RETURN_LOCALS
 )
 
-from io import StringIO
-def iteritems(d):
-    return d.items()
+from StringIO import StringIO
 
 from uncompyle6.semantics.pysource import (SourceWalker, deparse_code2str)
 
@@ -24,7 +22,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 (
@@ -38,7 +36,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]

pytest/test_single_compile.py

@@ -1,22 +1,20 @@
-import pytest
 from uncompyle6 import code_deparse
 from xdis.version_info import PYTHON_VERSION_TRIPLE
 
-pytest.mark.skip(PYTHON_VERSION_TRIPLE < (2, 7), reason="need Python < 2.7")
 
-
-def test_single_mode():
-    single_expressions = (
-        "i = 1",
-        "i and (j or k)",
-        "i += 1",
-        "i = j % 4",
-        "i = {}",
-        "i = []",
-        "for i in range(10):\n    i\n",
-        "for i in range(10):\n    for j in range(10):\n        i + j\n",
-        # 'try:\n    i\nexcept Exception:\n    j\nelse:\n    k\n'
-    )
+if PYTHON_VERSION_TRIPLE == (2, 7):
+    def test_single_mode():
+        single_expressions = (
+            'i = 1',
+            'i and (j or k)',
+            'i += 1',
+            'i = j % 4',
+            'i = {}',
+            'i = []',
+            'for i in range(10):\n    i\n',
+            'for i in range(10):\n    for j in range(10):\n        i + j\n',
+            'try:\n    i\nexcept Exception:\n    j\nelse:\n    k\n'
+        )
 
     for expr in single_expressions:
         code = compile(expr + "\n", "<string>", "single")

pytest/validate.py

@@ -17,6 +17,12 @@ from xdis import Bytecode, get_opcode
 
 opc = get_opcode(PYTHON_VERSION_TRIPLE, IS_PYPY)
 Bytecode = functools.partial(Bytecode, opc=opc)
+
+if PYTHON_VERSION_TRIPLE < (2, 5):
+    from cStringIO import StringIO
+else:
+    from StringIO import StringIO
+
 import six
 
 def _dis_to_text(co):
@@ -122,7 +128,7 @@ def validate_uncompyle(text, mode="exec"):
     original_text = text
 
     deparsed = code_deparse(
-        original_code, out=six.StringIO(), version=PYTHON_VERSION_TRIPLE, compile_mode=mode
+        original_code, out=StringIO(), version=PYTHON_VERSION_TRIPLE, compile_mode=mode
     )
     uncompyled_text = deparsed.text
     uncompyled_code = compile(uncompyled_text, "<string>", "exec")

requirements.txt

@@ -1,9 +1,5 @@
 # Pick up stuff from setup.py
-hypothesis==2.0.0
 pytest
 -e .
 
-Click~=7.0
 xdis>=6.0.4
-configobj~=5.0.6
-setuptools~=65.3.0

setup.py

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

test-unit/test_grammar.py

@@ -0,0 +1,56 @@
+import re
+import unittest
+from uncompyle6.parser import get_python_parser, python_parser
+from xdis.version_info import PYTHON_VERSION_TRIPLE, IS_PYPY
+
+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_TRIPLE, is_pypy=IS_PYPY)
+        (lhs, rhs, tokens,
+         right_recursive, dup_rhs) = p.check_sets()
+        expect_lhs = set(['pos_arg', 'get_iter', 'attribute'])
+        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
+
+    # FIXME: Something got borked here
+    def no_test_dup_rule(self):
+        import inspect
+        python_parser(PYTHON_VERSION_TRIPLE, 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

@@ -30,55 +30,46 @@ check:
 	$(MAKE) check-$(PYTHON_VERSION)
 
 #: Run working tests from Python 2.6 or 2.7
-check-2.6 check-2.7: check-bytecode-2 check-bytecode-3 check-bytecode-1 check-native-short
+check-2.4 check-2.5 check-2.6 check-2.7: check-bytecode-2 check-bytecode-3 check-bytecode-1  check-native-short
 
 #: Run working tests from Python 3.0
 check-3.0: check-bytecode
-	$(PYTHON) test_pythonlib.py --bytecode-3.0-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.0 --syntax-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --bytecode-3.0-run
 
 #: Run working tests from Python 3.1
 check-3.1: check-bytecode
-	$(PYTHON) test_pythonlib.py --bytecode-3.1-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.1 --syntax-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --bytecode-3.1-run
 
 #: Run working tests from Python 3.2
 check-3.2: check-bytecode
-	$(PYTHON) test_pythonlib.py --bytecode-3.2-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.2 --syntax-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --bytecode-3.2-run
 
 #: Run working tests from Python 3.3
 check-3.3: check-bytecode
-	$(PYTHON) test_pythonlib.py --bytecode-3.3-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.3 --syntax-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --bytecode-3.3-run
 
 #: Run working tests from Python 3.4
 check-3.4: check-bytecode check-3.4-ok check-2.7-ok
-	$(PYTHON) test_pythonlib.py --bytecode-3.4-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.4 --syntax-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --bytecode-3.4-run
 
 #: Run working tests from Python 3.5
 check-3.5: check-bytecode
-	$(PYTHON) test_pythonlib.py --bytecode-3.5-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.5 --syntax-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --bytecode-3.5-run
 
 #: Run working tests from Python 3.6
 check-3.6: check-bytecode
-	$(PYTHON) test_pythonlib.py --bytecode-3.6-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.6 --syntax-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --bytecode-3.6-run
 
 #: Run working tests from Python 3.7
 check-3.7: check-bytecode
-	$(PYTHON) test_pythonlib.py --bytecode-3.7-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.7 --syntax-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --bytecode-3.7-run
 
+# #: 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)
 check-pypy37: check-bytecode
-	$(PYTHON) test_pythonlib.py --bytecode-pypy37 --verify-run
-
-#: Run working tests from Python 3.8
-check-3.8: check-bytecode
-	$(PYTHON) test_pythonlib.py --bytecode-3.8-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.8 --syntax-verify $(COMPILE)
+	$(PYTHON) test_pythonlib.py --bytecode-pypy37
 
 check-3.9: check-bytecode
 	@echo "Note that we do not support decompiling Python 3.9 bytecode - no 3.9 tests run"
@@ -274,54 +265,58 @@ grammar-coverage-3.7:
 
 #: Check deparsing Python 3.0
 check-bytecode-3.0:
-	$(PYTHON) test_pythonlib.py --bytecode-3.0-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.0 --syntax-verify
+	$(PYTHON) test_pythonlib.py --bytecode-3.0-run
+	$(PYTHON) test_pythonlib.py --bytecode-3.0
 
 #: Check deparsing Python 3.1
 check-bytecode-3.1:
-	$(PYTHON) test_pythonlib.py --bytecode-3.1-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.1 --syntax-verify
+	$(PYTHON) test_pythonlib.py --bytecode-3.1-run
+	$(PYTHON) test_pythonlib.py --bytecode-3.1
 
 #: Check deparsing Python 3.2
 check-bytecode-3.2:
-	$(PYTHON) test_pythonlib.py --bytecode-3.2-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.2 --syntax-verify
+	$(PYTHON) test_pythonlib.py --bytecode-3.2-run
+	$(PYTHON) test_pythonlib.py --bytecode-3.2
 
 #: Check deparsing Python 3.3
 check-bytecode-3.3:
-	$(PYTHON) test_pythonlib.py --bytecode-3.3-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.3 --syntax-verify
+	$(PYTHON) test_pythonlib.py --bytecode-3.3-run
+	$(PYTHON) test_pythonlib.py --bytecode-3.3
 
 #: Check deparsing Python 3.4
 check-bytecode-3.4:
-	$(PYTHON) test_pythonlib.py --bytecode-3.4-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.4 --syntax-verify
+	$(PYTHON) test_pythonlib.py --bytecode-3.4-run
+	$(PYTHON) test_pythonlib.py --bytecode-3.4
 
 #: Check deparsing Python 3.5
 check-bytecode-3.5:
-	$(PYTHON) test_pythonlib.py --bytecode-3.5-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.5 --syntax-verify
+	$(PYTHON) test_pythonlib.py --bytecode-3.5-run
+	$(PYTHON) test_pythonlib.py --bytecode-3.5
 
 #: Check deparsing Python 3.6
 check-bytecode-3.6:
-	$(PYTHON) test_pythonlib.py --bytecode-3.6-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.6 --syntax-verify
+	$(PYTHON) test_pythonlib.py --bytecode-3.6-run
+	$(PYTHON) test_pythonlib.py --bytecode-3.6
 
 #: Check deparsing Python 3.7
 check-bytecode-3.7:
-	$(PYTHON) test_pythonlib.py --bytecode-3.7-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.7 --syntax-verify
+	$(PYTHON) test_pythonlib.py --bytecode-3.7-run
+	$(PYTHON) test_pythonlib.py --bytecode-3.7
 
 #: Check deparsing Python 3.8
 check-bytecode-3.8:
-	$(PYTHON) test_pythonlib.py --bytecode-3.8-run --verify-run
-	$(PYTHON) test_pythonlib.py --bytecode-3.8 --syntax-verify
+	$(PYTHON) test_pythonlib.py --bytecode-3.8-run
+	$(PYTHON) test_pythonlib.py --bytecode-3.8
 
 #: 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/dis-compare.py

@@ -1,17 +1,16 @@
 #!/usr/bin/env python
 # Mode: -*- python -*-
 #
-# Copyright (c) 2015 by Rocky Bernstein <rb@dustyfeet.com>
+# Copyright (c) 2015, 2017, 2022 by Rocky Bernstein <rb@dustyfeet.com>
 #
-from __future__ import print_function
-
 
 import dis, os.path
+from xdis import PYTHON_VERSION_TRIPL< PYTHON_VERSION_STR
 
-try:
+if PYTHON_VERSION_TRIPLE < (2, 5):
+    from cStringIO import StringIO
+else:
     from StringIO import StringIO
-except ImportError:
-    from io import StringIO
 
 program =  os.path.basename(__file__)
 
@@ -23,7 +22,7 @@ Usage: %s [OPTIONS]... FILE
 usage_short = "Usage: %s [OPTIONS]... FILE" % program
 
 import uncompyle6
-from uncompyle6 import PYTHON_VERSION_STR, check_python_version
+from uncompyle6 check_python_version
 from uncompyle6.disas import disco
 
 def inst_fmt(inst):

test/run-and-email.sh

@@ -34,10 +34,9 @@ else
 fi
 
 MAIN="test_pyenvlib.py"
-
 USER=${USER:-rocky}
 EMAIL=${EMAIL:-rb@dustyfeet.com}
-WHAT="uncompyle6 ${MAIN}"
+WHAT="uncompyle6 2.4 ${MAIN}"
 MAX_TESTS=${MAX_TESTS:-800}
 export BATCH=1
 
@@ -45,7 +44,7 @@ typeset -i RUN_STARTTIME=$(date +%s)
 
 # PYVERSIONS="3.5.6"
 MAILBODY=/tmp/${MAIN}-mailbody-$$.txt
-# for VERSION in 3.3.7 ; do
+# for VERSION in 2.4.6 2.5.9 ; do
 for VERSION in $PYVERSIONS ; do
     typeset -i rc=0
     LOGFILE=/tmp/${MAIN}-$VERSION-$$.log

test/simple-decompile-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 import sysinfo2float
 import sys, inspect

test/simple_source/bug14/lambda.py

@@ -0,0 +1,17 @@
+palette = map(lambda a:(a,
+ a,
+ a)
+, range(256))
+palette = map(lambda (r, g, b,):((chr(r) + chr(g)) + chr(b))
+, palette)
+palette = map(lambda r:r
+, palette)
+palette = lambda (r, g, b,):r
+
+palette = lambda (r):r
+
+palette = lambda r:r
+
+palette = (lambda (r):r
+,
+ palette)

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/stdlib/3.6-exclude.sh

@@ -5,6 +5,7 @@ SKIP_TESTS=(
     [test_ftplib.py]=1 # FIXME: Works on c90ff51
     [test_slice.py]=1 # FIXME: Works on c90ff51
     [test_sort.py]=1 # FIXME: Works on c90ff51
+    [test_strftime.py]=1 # FIXME: Works on c90ff51
     [test_timeit.py]=1 # FIXME: Works on c90ff51
     [test_os.py]=1 # parse error FIXME: Works on c90ff51
 

test/stdlib/runtests.sh

@@ -234,7 +234,7 @@ for file in $files; do
     $fulldir/compile-file.py $file && \
     mv $file{,.orig} && \
     echo ==========  $(date +%X) Decompiling $file ===========
-    $DECOMPILER $OPTS $decompiled_file > $file
+    $DECOMPILER $OPTS $decompiled_file > $file 2>/dev/null
     rc=$?
     if (( rc == 0 )) ; then
 	echo ========== $(date +%X) Running $file ===========

test/test_pyenvlib.py

@@ -20,8 +20,6 @@ Step 2: Run the test:
 	  test_pyenvlib --mylib --verify # decompile verify 'mylib'
 """
 
-from __future__ import print_function
-
 import os, time, re, shutil, sys
 from fnmatch import fnmatch
 
@@ -81,10 +79,6 @@ for vers in TEST_VERSIONS:
     else:
         if vers == "native":
             short_vers = os.path.basename(sys.path[-1])
-            from xdis.version_info import PYTHON_VERSION_TRIPLE, version_tuple_to_str
-            if PYTHON_VERSION_TRIPLE > (3, 0):
-                version = version_tuple_to_str(end=2)
-                PYC = f"*.cpython-{version}.pyc"
             test_options[vers] = (sys.path[-1], PYC, short_vers)
         else:
             short_vers = vers[:3]

test/test_pythonlib.py

@@ -27,17 +27,19 @@ 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 fnmatch import fnmatch
 from uncompyle6.main import main
-from xdis.version_info import PYTHON_VERSION
+from xdis.version_info import PYTHON_VERSION, PYTHON_VERSION_TRIPLE
 
 
 def get_srcdir():
-    filename = os.path.normcase(os.path.dirname(__file__))
+    if PYTHON_VERSION_TRIPLE < (2, 5):
+        def five(): return 5
+        filename = five.func_code.co_filename
+    else:
+        filename = os.path.normcase(os.path.dirname(__file__))
     return os.path.realpath(filename)
 
 
@@ -165,11 +167,10 @@ def do_tests(src_dir, obj_patterns, target_dir, opts):
     if opts["do_compile"]:
         compiled_version = opts["compiled_version"]
         if compiled_version and PYTHON_VERSION != compiled_version:
-            print(
-                "Not compiling: desired Python version is %s but we are running %s"
-                % (compiled_version, PYTHON_VERSION),
-                file=sys.stderr,
-            )
+            sys.stderr.write("Not compiling: "
+                             "desired Python version is %s "
+                             "but we are running %s" %
+                             (compiled_version, PYTHON_VERSION))
         else:
             for root, dirs, basenames in os.walk(src_dir):
                 file_matches(files, root, basenames, PY)
@@ -187,10 +188,8 @@ def do_tests(src_dir, obj_patterns, target_dir, opts):
         file_matches(files, dirname, basenames, obj_patterns)
 
     if not files:
-        print(
-            "Didn't come up with any files to test! Try with --compile?",
-            file=sys.stderr,
-        )
+        sys.stderr.write("Didn't come up with any files to test! "
+                         "Try with --compile?")
         exit(1)
 
     os.chdir(cwd)
@@ -205,8 +204,8 @@ def do_tests(src_dir, obj_patterns, target_dir, opts):
             pass
 
     print(time.ctime())
-    print("Source directory: ", src_dir)
-    print("Output directory: ", target_dir)
+    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"]
@@ -293,13 +292,13 @@ if __name__ == "__main__":
         if os.path.isdir(src_dir):
             checked_dirs.append([src_dir, pattern, target_dir])
         else:
-            print("Can't find directory %s. Skipping" % src_dir, file=sys.stderr)
+            sys.stderr.write("Can't find directory %s. Skipping" % src_dir)
             continue
         last_compile_version = compiled_version
         pass
 
     if not checked_dirs:
-        print("No directories found to check", file=sys.stderr)
+        sys.stderr.write("No directories found to check\n")
         sys.exit(1)
 
     test_opts["compiled_version"] = last_compile_version

uncompyle6/.gitignore

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

uncompyle6/bin/pydisassemble.py

@@ -3,7 +3,6 @@
 #
 # Copyright (c) 2015-2016, 2018, 2020, 2022 by Rocky Bernstein <rb@dustyfeet.com>
 #
-from __future__ import print_function
 import sys, os, getopt
 
 from uncompyle6.code_fns 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/Tokenize FILE with in the way that is done to
 assist uncompyle6 in parsing the instruction stream. For example
@@ -30,9 +29,9 @@ Python library module "dis", or pydisasm from the cross-version
 Python bytecode package "xdis".
 
 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.
 
@@ -40,7 +39,7 @@ Options:
   -V | --version     show version and stop
   -h | --help        show this message
 
-""".format(program)
+""" % ((program,) * 5)
 
 PATTERNS = ('*.pyc', '*.pyo')
 
@@ -49,15 +48,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:
@@ -69,15 +68,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-2020 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
 from xdis.version_info import version_tuple_to_str
 
@@ -72,15 +71,12 @@ def usage():
 
 
 def main_bin():
-    if not (sys.version_info[0:2] in ((2, 6), (2, 7), (3, 0),
+    if not (sys.version_info[0:2] in ((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), (3, 9), (3, 10)
         )):
-        print(
-            f"Error: {program} can decompile only bytecode from Python 3.7"
-            f""" to 3.8.\n\tYou have version: {version_tuple_to_str()}."""
-        )
+        print('Error: %s requires Python 2.4-3.10' % program)
         sys.exit(-1)
 
     do_verify = recurse_dirs = False
@@ -98,8 +94,9 @@ def main_bin():
                                     '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 = {}
@@ -154,7 +151,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
@@ -178,8 +175,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 == '-':
@@ -201,8 +198,8 @@ def main_bin():
                 mess = status_msg(*result)
                 print('# ' + mess)
                 pass
-        except ImportError as e:
-            print(str(e))
+        except ImportError:
+            print(str(sys.exc_info()[1]))
             sys.exit(2)
         except (KeyboardInterrupt):
             pass

uncompyle6/code_fns.py

@@ -46,9 +46,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_tuple_to_str(version), file=real_out)
+    real_out.write("# Python %s\n" % version_tuple_to_str(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)
 
@@ -61,16 +61,14 @@ def disco_loop(disasm, queue, real_out):
         co = queue.popleft()
         if co.co_name != "<module>":
             if hasattr(co, "co_firstlineno"):
-                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)
                 )
             else:
-                print(
-                    "\n# %s of %s"
-                    % (co.co_name, co.co_filename),
-                    file=real_out,
+                real_out.write(
+                    "\n# %s %s\n"
+                    % (co.co_name, co.co_filename)
                 )
         tokens, customize = disasm(co)
         for t in tokens:
@@ -78,7 +76,7 @@ def disco_loop(disasm, queue, real_out):
                 queue.append(t.pattr)
             elif iscode(t.attr):
                 queue.append(t.attr)
-            print(t, file=real_out)
+            real_out.write(str(t) + "\n")
             pass
         pass
 

uncompyle6/linenumbers.py

@@ -38,7 +38,7 @@ def line_number_mapping(pyc_filename, src_filename):
     ) = 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,9 +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 typing import Any, Tuple
-import datetime, py_compile, os, sys
+import datetime, os, py_compile, subprocess, sys
 
 from xdis import iscode
 from xdis.version_info import IS_PYPY, PYTHON_VERSION_TRIPLE, version_tuple_to_str
@@ -22,6 +20,7 @@ from uncompyle6.code_fns import check_object_path
 from uncompyle6.semantics import pysource
 from uncompyle6.semantics.pysource import PARSER_DEFAULT_DEBUG
 from uncompyle6.parser import ParserError
+from uncompyle6 import verify
 from uncompyle6.version import __version__
 
 # from uncompyle6.linenumbers import line_number_mapping
@@ -32,7 +31,7 @@ from uncompyle6.semantics.linemap import deparse_code_with_map
 
 from xdis.load import load_module
 
-def _get_outstream(outfile: str) -> Any:
+def _get_outstream(outfile):
     dir = os.path.dirname(outfile)
     failed_file = outfile + "_failed"
     if os.path.exists(failed_file):
@@ -41,12 +40,11 @@ def _get_outstream(outfile: str) -> Any:
         os.makedirs(dir)
     except OSError:
         pass
-    return open(outfile, mode="w", encoding="utf-8")
-
+    return open(outfile, 'wb')
 
 def decompile(
     co,
-    bytecode_version: Tuple[int] = PYTHON_VERSION_TRIPLE,
+    bytecode_version = PYTHON_VERSION_TRIPLE,
     out=sys.stdout,
     showasm=None,
     showast={},
@@ -60,7 +58,7 @@ def decompile(
     mapstream=None,
     do_fragments=False,
     compile_mode="exec",
-) -> Any:
+):
     """
     ingests and deparses a given code block 'co'
 
@@ -79,10 +77,23 @@ def decompile(
         s += "\n"
         real_out.write(s)
 
-    assert iscode(co), f"""{co} does not smell like code"""
+    assert iscode(co), ("%s does not smell like code" % co)
+
+    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 = ""
 
-    co_pypy_str = "PyPy " if is_pypy else ""
-    run_pypy_str = "PyPy " if IS_PYPY else ""
     sys_version_lines = sys.version.split("\n")
     if source_encoding:
         write("# -*- coding: %s -*-" % source_encoding)
@@ -93,20 +104,24 @@ def decompile(
             __version__,
             co_pypy_str,
             version_tuple_to_str(bytecode_version),
-            " (%s)" % str(magic_int) if magic_int else "",
-            run_pypy_str,
+           " (%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)
 
     # maybe a second -a will do before as well
-    asm = "after" if showasm else None
+    if showasm:
+        asm = "after"
+    else:
+        asm = None
 
     grammar = dict(PARSER_DEFAULT_DEBUG)
     if showgrammar:
@@ -128,6 +143,7 @@ def decompile(
                 showgrammar,
                 code_objects=code_objects,
                 is_pypy=is_pypy,
+                compile_mode=compile_mode,
             )
             header_count = 3 + len(sys_version_lines)
             linemap = [
@@ -150,12 +166,12 @@ def decompile(
             )
             pass
         return deparsed
-    except pysource.SourceWalkerError as e:
+    except pysource.SourceWalkerError, e:
         # deparsing failed
         raise pysource.SourceWalkerError(str(e))
 
 
-def compile_file(source_path: str) -> str:
+def compile_file(source_path):
     if source_path.endswith(".py"):
         basename = source_path[:-3]
     else:
@@ -172,7 +188,7 @@ def compile_file(source_path: str) -> str:
 
 
 def decompile_file(
-    filename: str,
+    filename,
     outstream=None,
     showasm=None,
     showast={},
@@ -180,7 +196,7 @@ def decompile_file(
     source_encoding=None,
     mapstream=None,
     do_fragments=False,
-) -> Any:
+):
     """
     decompile Python byte-code file (.pyc). Return objects to
     all of the deparsed objects found in `filename`.
@@ -237,10 +253,10 @@ def decompile_file(
 
 # FIXME: combine into an options parameter
 def main(
-    in_base: str,
-    out_base: str,
-    compiled_files: list,
-    source_files: list,
+    in_base,
+    out_base,
+    compiled_files,
+    source_files,
     outfile=None,
     showasm=None,
     showast={},
@@ -250,7 +266,7 @@ def main(
     raise_on_error=False,
     do_linemaps=False,
     do_fragments=False,
-) -> Tuple[int, int, int, int]:
+):
     """
     in_base	base directory for input files
     out_base	base directory for output files (ignored when
@@ -288,6 +304,17 @@ def main(
             outstream = sys.stdout
             if do_linemaps:
                 linemap_stream = sys.stdout
+            if do_verify:
+                prefix = os.path.basename(filename) + "-"
+                if prefix.endswith(".py"):
+                    prefix = prefix[: -len(".py")]
+
+                # Unbuffer output if possible
+                if sys.stdout.isatty():
+                    buffering = -1
+                else:
+                    buffering = 0
+                sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', buffering)
         else:
             if filename.endswith(".pyc"):
                 current_outfile = os.path.join(out_base, filename[0:-1])
@@ -331,9 +358,9 @@ def main(
                     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(f"\n# file {infile}\n# {e}\n")
+            sys.stderr.write("# file %s\n" % (infile))
             failed_files += 1
             tot_files += 1
         except KeyboardInterrupt:
@@ -341,10 +368,10 @@ def main(
                 outstream.close()
                 os.remove(outfile)
             sys.stdout.write("\n")
-            sys.stderr.write(f"\nLast file: {infile}   ")
+            sys.stderr.write("\nLast file: %s   " % (infile))
             raise
-        except RuntimeError as e:
-            sys.stdout.write(f"\n{str(e)}\n")
+        except RuntimeError, e:
+            sys.stdout.write("\n%s\n" % str(e))
             if str(e).startswith("Unsupported Python"):
                 sys.stdout.write("\n")
                 sys.stderr.write(
@@ -369,14 +396,50 @@ def main(
         else:  # uncompile successful
             if current_outfile:
                 outstream.close()
-                okay_files += 1
+                if do_verify:
+                    try:
+                        msg = verify.compare_code_with_srcfile(
+                            infile, current_outfile, do_verify
+                        )
+                        if not current_outfile:
+                            if not msg:
+                                print("\n# okay decompiling %s" % infile)
+                                okay_files += 1
+                            else:
+                                verify_failed_files += 1
+                                print("\n# %s\n\t%s", infile, msg)
+                                pass
+                        else:
+                            okay_files += 1
+                            pass
+                    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
+                        pass
+                    pass
+                else:
+                    okay_files += 1
+                pass
+            elif do_verify:
+                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"
@@ -434,5 +497,9 @@ def status_msg(do_verify, tot_files, okay_files, failed_files, verify_failed_fil
             return "\n# Successfully decompiled file"
             pass
         pass
-    mess = f"decompiled {tot_files} files: {okay_files} okay, {failed_files} failed"
+    mess = "decompiled %i files: %i okay, %i failed" % (
+        tot_files,
+        okay_files,
+        failed_files,
+    )
     return mess

uncompyle6/parser.py

@@ -895,10 +895,9 @@ def python_parser(
 if __name__ == "__main__":
 
     def parse_test(co):
-        from xdis import PYTHON_VERSION_TRIPLE, IS_PYPY
+        from xdis.version_info import PYTHON_VERSION_TRIPLE, IS_PYPY
 
-        ast = python_parser(PYTHON_VERSION_TRIPLE, co, showasm=True, is_pypy=IS_PYPY)
+        ast = python_parser(PYTHON_VERSION_TRIPLE[:2], co, showasm=True, is_pypy=IS_PYPY)
         print(ast)
         return
-
-    parse_test(parse_test.__code__)
+    parse_test(parse_test.func_code)

uncompyle6/parsers/parse14.py

@@ -64,7 +64,7 @@ class Python14Parser(Python15Parser):
 
             if opname_base == "UNPACK_VARARG":
                 if token.attr > 1:
-                    self.addRule(f"star_args ::= RESERVE_FAST {opname} args_store", nop_func)
+                    self.addRule("star_args ::= RESERVE_FAST %s args_store" % opname, nop_func)
 
 
     def reduce_is_invalid(self, rule, ast, tokens, first, last):