Merge branch 'python-3.0-to-3.2' into python-2.4-to-2.7

used in a recently-added rule

.circleci/config.yml

@@ -1,80 +0,0 @@
-version: 2
-filters:
-  branches:
-    only: master
-jobs:
-  build:
-    working_directory: ~/rocky/python-uncompyle6
-    parallelism: 1
-    shell: /bin/bash --login
-    # CircleCI 2.0 does not support environment variables that refer to each other the same way as 1.0 did.
-    # If any of these refer to each other, rewrite them so that they don't or see https://circleci.com/docs/2.0/env-vars/#interpolating-environment-variables-to-set-other-environment-variables .
-    environment:
-      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
-      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-      COMPILE: --compile
-    # 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.8
-    steps:
-      # Machine Setup
-      #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
-      # The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out.
-      - checkout
-      # Prepare for artifact and test results  collection equivalent to how it was done on 1.0.
-      # In many cases you can simplify this from what is generated here.
-      # 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/'
-      - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
-      # This is based on your 1.0 configuration file or project settings
-      - run:
-          working_directory: ~/rocky/python-uncompyle6
-          command: pip install --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
-      - restore_cache:
-          keys:
-            - v2-dependencies-{{ .Branch }}-
-            # fallback to using the latest cache if no exact match is found
-            - v2-dependencies-
-
-      - run:
-          command: | # Use pip to install dependengcies
-            sudo pip install --user --upgrade setuptools
-            pip install --user -e .
-            # Not sure why "pip install -e" doesn't work above
-            # pip install click spark-parser xdis
-            pip install --user -r requirements-dev.txt
-
-      # Save dependency cache
-      - save_cache:
-          key: v2-dependencies-{{ .Branch }}-{{ epoch }}
-          paths:
-            # This is a broad list of cache paths to include many possible development environments
-            # You can probably delete some of these entries
-            - vendor/bundle
-            - ~/virtualenvs
-            - ~/.m2
-            - ~/.ivy2
-            - ~/.bundle
-            - ~/.cache/bower
-
-      # Test
-      #   This would typically be a build job when using workflows, possibly combined with build
-      # This is based on your 1.0 configuration file or project settings
-      - run: sudo python ./setup.py develop && make check-3.6
-      - run: cd ./test/stdlib && bash ./runtests.sh 'test_[p-z]*.py'
-      # Teardown
-      #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
-      # Save test results
-      - store_test_results:
-          path: /tmp/circleci-test-results
-      # Save artifacts
-      - store_artifacts:
-          path: /tmp/circleci-artifacts
-      - store_artifacts:
-          path: /tmp/circleci-test-results
-    # The resource_class feature allows configuring CPU and RAM resources for each job. Different resource classes are available for different executors. https://circleci.com/docs/2.0/configuration-reference/#resourceclass
-    resource_class: large

.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.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
-        pip install -e .
-        # Not sure why "pip install -e" doesn't work above
-        # pip install click spark-parser xdis
-        pip install -r requirements-dev.txt
-    - name: Test uncompyle6
-      run: |
-        make check

.github/workflows/ubuntu.yml

@@ -1,29 +0,0 @@
-name: uncompyle6 (ubuntu)
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [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
-        pip install -e .
-        # pip install click spark-parser xdis
-        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.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
-        pip install -e .
-        # Not sure why "pip install -e" doesn't work above
-        # pip install click spark-parser xdis
-        pip install -r requirements-dev.txt
-    - name: Test uncompyle6
-      run: |
-        make check

.pre-commit-config.yaml

@@ -9,14 +9,3 @@ repos:
       stages: [commit]
     - id: end-of-file-fixer
       stages: [commit]
--   repo: https://github.com/pycqa/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        stages: [commit]
--   repo: https://github.com/psf/black
-    rev: 23.12.1
-    hooks:
-    - id: black
-      language_version: python3
-      stages: [commit]

.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

PKG-INFO

@@ -7,54 +7,54 @@ Author: Rocky Bernstein, Hartmut Goebel, John Aycock, and others
 Author-email: rb@dustyfeet.com
 License: GPL3
 Description: |buildstatus|  |Pypi Installs| |Latest Version| |Supported Python Versions|
-        
+
         |packagestatus|
-        
+
         .. contents::
-        
+
         uncompyle6
         ==========
-        
+
         A native Python cross-version decompiler and fragment decompiler.
         The successor to decompyle, uncompyle, and uncompyle2.
-        
-        
+
+
         Introduction
         ------------
-        
+
         *uncompyle6* translates Python bytecode back into equivalent Python
         source code. It accepts bytecodes from Python version 1.0 to version
         3.8, spanning over 24 years of Python releases. We include Dropbox's
         Python 2.5 bytecode and some PyPy bytecodes.
-        
+
         Why this?
         ---------
-        
+
         Ok, I'll say it: this software is amazing. It is more than your
         normal hacky decompiler. Using compiler_ technology, the program
         creates a parse tree of the program from the instructions; nodes at
         the upper levels that look a little like what might come from a Python
         AST. So we can really classify and understand what's going on in
         sections of Python bytecode.
-        
+
         Building on this, another thing that makes this different from other
         CPython bytecode decompilers is the ability to deparse just
         *fragments* of source code and give source-code information around a
         given bytecode offset.
-        
+
         I use the tree fragments to deparse fragments of code *at run time*
         inside my trepan_ debuggers_. For that, bytecode offsets are recorded
         and associated with fragments of the source code. This purpose,
         although compatible with the original intention, is yet a little bit
         different.  See this_ for more information.
-        
+
         Python fragment deparsing given an instruction offset is useful in
         showing stack traces and can be incorporated into any program that
         wants to show a location in more detail than just a line number at
         runtime.  This code can be also used when source-code information does
         not exist and there is just bytecode. Again, my debuggers make use of
         this.
-        
+
         There were (and still are) a number of decompyle, uncompyle,
         uncompyle2, uncompyle3 forks around. Many of them come basically from
         the same code base, and (almost?) all of them are no longer actively
@@ -65,148 +65,148 @@ Description: |buildstatus|  |Pypi Installs| |Latest Version| |Supported Python V
         forward*. There is some serious refactoring and cleanup in this code
         base over those old forks. Even more experimental refactoring is going
         on in decompyle3_.
-        
+
         This demonstrably does the best in decompiling Python across all
         Python versions. And even when there is another project that only
         provides decompilation for subset of Python versions, we generally do
         demonstrably better for those as well.
-        
+
         How can we tell? By taking Python bytecode that comes distributed with
         that version of Python and decompiling these.  Among those that
         successfully decompile, we can then make sure the resulting programs
         are syntactically correct by running the Python interpreter for that
         bytecode version.  Finally, in cases where the program has a test for
         itself, we can run the check on the decompiled code.
-        
+
         We use an automated processes to find bugs. In the issue trackers for
         other decompilers, you will find a number of bugs we've found along
         the way. Very few to none of them are fixed in the other decompilers.
-        
+
         Requirements
         ------------
-        
+
         The code in the git repository can be run from Python 2.4 to the
         latest Python version, with the exception of Python 3.0 through
         3.2. Volunteers are welcome to address these deficiencies if there a
         desire to do so.
-        
+
         The way it does this though is by segregating consecutive Python versions into
         git branches:
-        
+
         master
            Python 3.6 and up (uses type annotations)
         python-3.3-to-3.5
            Python 3.3 through 3.5 (Generic Python 3)
         python-2.4
            Python 2.4 through 2.7 (Generic Python 2)
-        
+
         PyPy 3-2.4 and later works as well.
-        
+
         The bytecode files it can read have been tested on Python
         bytecodes from versions 1.4, 2.1-2.7, and 3.0-3.8 and later PyPy
         versions.
-        
+
         Installation
         ------------
-        
+
         You can install from PyPI using the name ``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
-        
+
         or::
-        
+
             $ 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.
-        
+
         Running Tests
         -------------
-        
+
         ::
-        
+
            make check
-        
+
         A GNU makefile has been added to smooth over setting running the right
         command, and running tests from fastest to slowest.
-        
+
         If you have remake_ installed, you can see the list of all tasks
         including tests via :code:`remake --tasks`
-        
-        
+
+
         Usage
         -----
-        
+
         Run
-        
+
         ::
-        
+
         $ uncompyle6 *compiled-python-file-pyc-or-pyo*
-        
+
         For usage help:
-        
+
         ::
-        
+
            $ uncompyle6 -h
-        
+
         Verification
         ------------
-        
+
         In older versions of Python it was possible to verify bytecode by
         decompiling bytecode, and then compiling using the Python interpreter
         for that bytecode version. Having done this, the bytecode produced
         could be compared with the original bytecode. However as Python's code
         generation got better, this no longer was feasible.
-        
+
         If you want Python syntax verification of the correctness of the
         decompilation process, add the :code:`--syntax-verify` option. However since
         Python syntax changes, you should use this option if the bytecode is
         the right bytecode for the Python interpreter that will be checking
         the syntax.
-        
+
         You can also cross compare the results with another version of
         `uncompyle6` since there are sometimes regressions in decompiling
         specific bytecode as the overall quality improves.
-        
+
         For Python 3.7 and 3.8, the code in decompyle3_ is generally
         better.
-        
+
         Or try specific another python decompiler like uncompyle2_, unpyc37_,
         or pycdc_.  Since the later two work differently, bugs here often
         aren't in that, and vice versa.
-        
+
         There is an interesting class of these programs that is readily
         available give stronger verification: those programs that when run
         test themselves. Our test suite includes these.
-        
+
         And Python comes with another a set of programs like this: its test
         suite for the standard library. We have some code in :code:`test/stdlib` to
         facilitate this kind of checking too.
-        
+
         Known Bugs/Restrictions
         -----------------------
-        
+
         The biggest known and possibly fixable (but hard) problem has to do
         with handling control flow. (Python has probably the most diverse and
         screwy set of compound statements I've ever seen; there
         are "else" clauses on loops and try blocks that I suspect many
         programmers don't know about.)
-        
+
         All of the Python decompilers that I have looked at have problems
         decompiling Python's control flow. In some cases we can detect an
         erroneous decompilation and report that.
-        
+
         Python support is pretty good for Python 2
-        
+
         On the lower end of Python versions, decompilation seems pretty good although
         we don't have any automated testing in place for Python's distributed tests.
         Also, we don't have a Python interpreter for versions 1.6, and 2.0.
-        
+
         In the Python 3 series, Python support is strongest around 3.4 or
         3.3 and drops off as you move further away from those versions. Python
         3.0 is weird in that it in some ways resembles 2.6 more than it does
@@ -218,43 +218,43 @@ Description: |buildstatus|  |Pypi Installs| |Latest Version| |Supported Python V
         :code:`EXTENDED_ARG` instructions, additional jump optimization has been
         added. So in sum handling control flow by ad hoc means as is currently
         done is worse.
-        
+
         Between Python 3.5, 3.6, 3.7 there have been major changes to the
         :code:`MAKE_FUNCTION` and :code:`CALL_FUNCTION` instructions.
-        
+
         Python 3.8 removes :code:`SETUP_LOOP`, :code:`SETUP_EXCEPT`,
         :code:`BREAK_LOOP`, and :code:`CONTINUE_LOOP`, instructions which may
         make control-flow detection harder, lacking the more sophisticated
         control-flow analysis that is planned. We'll see.
-        
+
         Currently not all Python magic numbers are supported. Specifically in
         some versions of Python, notably Python 3.6, the magic number has
         changes several times within a version.
-        
+
         **We support only released versions, not candidate versions.** Note
         however that the magic of a released version is usually the same as
         the *last* candidate version prior to release.
-        
+
         There are also customized Python interpreters, notably Dropbox,
         which use their own magic and encrypt bytecode. With the exception of
         the Dropbox's old Python 2.5 interpreter this kind of thing is not
         handled.
-        
+
         We also don't handle PJOrion_ or otherwise obfuscated code. For
         PJOrion try: PJOrion Deobfuscator_ to unscramble the bytecode to get
         valid bytecode before trying this tool; pydecipher_ might help with that.
-        
+
         This program can't decompile Microsoft Windows EXE files created by
         Py2EXE_, although we can probably decompile the code after you extract
         the bytecode properly. `Pydeinstaller <https://github.com/charles-dyfis-net/pydeinstaller>`_ may help with unpacking Pyinstaller bundlers.
-        
+
         Handling pathologically long lists of expressions or statements is
         slow. We don't handle Cython_ or MicroPython which don't use bytecode.
-        
+
         There are numerous bugs in decompilation. And that's true for every
         other CPython decompiler I have encountered, even the ones that
         claimed to be "perfect" on some particular version like 2.4.
-        
+
         As Python progresses decompilation also gets harder because the
         compilation is more sophisticated and the language itself is more
         sophisticated. I suspect that attempts there will be fewer ad-hoc
@@ -265,28 +265,28 @@ Description: |buildstatus|  |Pypi Installs| |Latest Version| |Supported Python V
         project is better funded, I do not intend to make any serious effort
         to support Python versions 3.8 or 3.9, including bugs that might come
         in. I imagine at some point I may be interested in it.
-        
+
         You can easily find bugs by running the tests against the standard
         test suite that Python uses to check itself. At any given time, there are
         dozens of known problems that are pretty well isolated and that could
         be solved if one were to put in the time to do so. The problem is that
         there aren't that many people who have been working on bug fixing.
-        
+
         Some of the bugs in 3.7 and 3.8 are simply a matter of back-porting
         the fixes in decompyle3. Volunteers are welcome to do so.
-        
+
         You may run across a bug, that you want to report. Please do so after
         reading `How to report a bug
         <https://github.com/rocky/python-uncompyle6/blob/master/HOW-TO-REPORT-A-BUG.md>`_ and
         follow the `instructions when opening an issue <https://github.com/rocky/python-uncompyle6/issues/new?assignees=&labels=&template=bug-report.md>`_.
-        
+
         Be aware that it might not get my attention for a while. If you
         sponsor or support the project in some way, I'll prioritize your
         issues above the queue of other things I might be doing instead.
-        
+
         See Also
         --------
-        
+
         * https://github.com/rocky/python-decompile3 : Much smaller and more modern code, focusing on 3.7 and 3.8. Changes in that will get migrated back here.
         * 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.
@@ -297,8 +297,8 @@ Description: |buildstatus|  |Pypi Installs| |Latest Version| |Supported Python V
         * https://github.com/rocky/python-xasm : Cross Python version assembler
         * https://github.com/rocky/python-uncompyle6/wiki : Wiki Documents which describe the code and aspects of it in more detail
         * https://github.com/zrax/pycdc : The README for this C++ code says it aims to support all versions of Python. You can aim your slign shot for the moon too, but I doubt you are going to hit it. This code is best for Python versions around 2.7 and 3.3 when the code was initially developed. Accuracy for current versions of Python3 and early versions of Python is lacking. Without major effort, it is unlikely it can be made to support current Python 3. See its `issue tracker <https://github.com/zrax/pycdc/issues>`_ for details. Currently lightly maintained.
-        
-        
+
+
         .. _Cython: https://en.wikipedia.org/wiki/Cython
         .. _trepan: https://pypi.python.org/pypi/trepan3k
         .. _compiler: https://github.com/rocky/python-uncompyle6/wiki/How-does-this-code-work%3F
@@ -323,9 +323,9 @@ Description: |buildstatus|  |Pypi Installs| |Latest Version| |Supported Python V
         .. |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
-        
-        
-Platform: UNKNOWN
+
+
+Platform: uncompyle6
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)

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.
@@ -306,15 +306,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

__pkginfo__.py

@@ -79,7 +79,7 @@ entry_points = {
     ]
 }
 ftp_url = None
-install_requires = ["click", "spark-parser >= 1.8.9, < 1.9.0", "xdis >= 6.1.1, < 6.2.0"]
+install_requires = ["spark-parser >= 1.8.9, < 1.9.0", "xdis >= 6.1.1, < 6.2.0"]
 
 license = "GPL3"
 mailing_list = "python-debugger@googlegroups.com"

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

@@ -12,8 +12,6 @@ if ! source ./pyenv-2.4-2.7-versions ; then
     exit $?
 fi
 if ! source ./setup-python-2.4.sh ; then
-    rc=$?
-    finish
     exit $rc
 fi
 
@@ -25,8 +23,6 @@ for version in $PYVERSIONS; do
     fi
     make clean && python setup.py develop
     if ! make check ; then
-	finish
-	rc=$?
 	exit $?
     fi
     echo === $version ===

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/update-sources.sh

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

pyproject.toml

@@ -1,64 +0,0 @@
-[build-system]
-requires = [
-    "setuptools>=71.0.3",
-]
-
-build-backend = "setuptools.build_meta"
-
-[project]
-authors = [
-    {name = "Rocky Bernstein",	email = "rb@dustyfeet.com"},
-]
-
-name = "uncompyle6"
-description = "Python cross-version byte-code library and disassembler"
-dependencies = [
-    "click",
-    "spark-parser >= 1.8.9, < 1.9.0",
-    "xdis >= 6.1.0, < 6.2.0",
-]
-readme = "README.rst"
-license = {text = "GPL"}
-keywords = ["Python bytecode", "bytecode", "disassembler"]
-classifiers = [
-    "Development Status :: 5 - Production/Stable",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: MIT License",
-    "Programming Language :: Python",
-    "Topic :: Software Development :: Libraries :: Python Modules",
-    "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",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-]
-dynamic = ["version"]
-
-[project.urls]
-Homepage = "https://github.com/rocky/python-uncompyle6"
-Downloads = "https://github.com/rocky/python-uncompyle6/releases"
-
-[project.optional-dependencies]
-dev = [
-    "pre-commit",
-    "pytest",
-]
-
-[project.scripts]
-uncompyle6 = "uncompyle6.bin.uncompile:main_bin"
-uncompyle6-tokenize = "uncompyle6.bin.pydisassemble:main"
-
-[tool.setuptools.dynamic]
-version = {attr = "uncompyle6.version.__version__"}

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

@@ -1,7 +1,9 @@
 import re
+
+from xdis.version_info import IS_PYPY, PYTHON_VERSION_TRIPLE
+
 from uncompyle6.parser import get_python_parser, python_parser
 from uncompyle6.scanner import get_scanner
-from xdis.version_info import PYTHON_VERSION_TRIPLE, IS_PYPY
 
 
 def test_grammar():
@@ -28,7 +30,7 @@ def test_grammar():
 
         expect_lhs.add("get_iter")
 
-        if PYTHON_VERSION_TRIPLE >= (3, 8) or PYTHON_VERSION_TRIPLE < (3, 0):
+        if PYTHON_VERSION_TRIPLE >= (3, 8):
             expect_lhs.add("stmts_opt")
     else:
         expect_lhs.add("async_with_as_stmt")
@@ -45,28 +47,34 @@ 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")))
@@ -98,7 +106,9 @@ def test_grammar():
     )
     reduced_dup_rhs = dict((k, dup_rhs[k]) for k in dup_rhs if k not in expect_dup_rhs)
     if reduced_dup_rhs:
-        print("\nPossible duplicate RHS that might be folded, into one of the LHS symbols")
+        print(
+            "\nPossible duplicate RHS that might be folded, into one of the LHS symbols"
+        )
         for k in reduced_dup_rhs:
             print(k, reduced_dup_rhs[k])
     # assert not reduced_dup_rhs, reduced_dup_rhs
@@ -123,6 +133,7 @@ def test_grammar():
             opcode_set.add("THEN")
         check_tokens(tokens, opcode_set)
     elif PYTHON_VERSION_TRIPLE[:2] == (3, 4):
+        ignore_set.add("LOAD_ARG")  # Used in grammar for comprehension. But not in 3.4
         ignore_set.add("LOAD_CLASSNAME")
         ignore_set.add("STORE_LOCALS")
         opcode_set = set(s.opc.opname).union(ignore_set)

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

@@ -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,7 @@
 # Pick up stuff from setup.py
-hypothesis==2.0.0
 pytest
 -e .
 
-Click~=7.0
-xdis>=6.0.4
+xdis >= 6.1.0, < 6.2.0
 configobj~=5.0.6
-setuptools~=71.0.3
+setuptools~=59.6.0

setup.py

@@ -1,6 +1,63 @@
 #!/usr/bin/env python
 """Setup script for the 'uncompyle6' distribution."""
 
-from setuptools import setup
+import setuptools
+import sys
 
-setup(packages=["uncompyle6"])
+SYS_VERSION = sys.version_info[0:2]
+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-3.3-3.5 code/branch."
+            % sys.version[0:3]
+        )
+    elif (3, 0) >= SYS_VERSION < (3, 3):
+        mess += (
+            "\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 before Python 2.4 version %s." % sys.version[0:3]
+        )
+    print(mess)
+    raise Exception(mess)
+
+from __pkginfo__ import (
+    __version__,
+    author,
+    author_email,
+    classifiers,
+    entry_points,
+    install_requires,
+    license,
+    long_description,
+    modname,
+    py_modules,
+    short_desc,
+    web,
+    zip_safe,
+)
+
+setuptools.setup(
+    author=author,
+    author_email=author_email,
+    classifiers=classifiers,
+    description=short_desc,
+    entry_points=entry_points,
+    install_requires=install_requires,
+    license=license,
+    long_description=long_description,
+    long_description_content_type="text/x-rst",
+    name=modname,
+    packages=setuptools.find_packages(),
+    py_modules=py_modules,
+    test_suite="nose.collector",
+    url=web,
+    version=__version__,
+    zip_safe=zip_safe,
+)

test-unit/test_grammar.py

@@ -0,0 +1,85 @@
+import re
+import unittest
+
+from xdis.version_info import IS_PYPY, PYTHON_VERSION_TRIPLE
+
+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_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", "unpack", "lambda_body"])
+
+        expect_right_recursive = frozenset(
+            [("designList", ("store", "DUP_TOP", "designList"))]
+        )
+        expect_lhs.add("kwarg")
+
+        if PYTHON_VERSION_TRIPLE[:2] <= (3, 6):
+            unused_rhs.add("call")
+
+        if PYTHON_VERSION_TRIPLE[:2] == (2, 7):
+            expect_lhs.add("kv3")
+            expect_lhs.add("kvlist")
+            unused_rhs.add("dict")
+
+        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-circleci.sh

@@ -0,0 +1,151 @@
+#!/bin/bash
+echo "This needs work"
+exit 0
+me=${BASH_SOURCE[0]}
+
+# Note: for 2.6 sometimes we need to set PYTHON=pytest
+PYTHON=${PYTHON:-python}
+
+typeset -i BATCH=${BATCH:-0}
+if (( ! BATCH )) ; then
+    isatty=$(/usr/bin/tty 2>/dev/null)
+    if [[ -n $isatty ]] && [[ "$isatty" != 'not a tty' ]] ; then
+	BATCH=0
+    fi
+fi
+
+
+function displaytime {
+  local T=$1
+  local D=$((T/60/60/24))
+  local H=$((T/60/60%24))
+  local M=$((T/60%60))
+  local S=$((T%60))
+  (( D > 0 )) && printf '%d days ' $D
+  (( H > 0 )) && printf '%d hours ' $H
+  (( M > 0 )) && printf '%d minutes ' $M
+  (( D > 0 || H > 0 || M > 0 )) && printf 'and '
+  printf '%d seconds\n' $S
+}
+
+FULLVERSION=2.7.18
+IS_PYPY=0
+MINOR=${FULLVERSION##?.?.}
+
+STOP_ONERROR=${STOP_ONERROR:-1}
+
+typeset -i timeout=15
+
+function timeout_cmd {
+
+  (
+    $@ &
+    child=$!
+    trap -- "" SIGTERM
+    (
+	sleep "$timeout"
+	if ps -p $child >/dev/null ; then
+	    echo ""
+	    echo >&1 "**Killing ${2}; takes more than $timeout seconds to run"
+	    kill -TERM ${child}
+	fi
+    ) &
+    wait "$child"
+  )
+}
+
+. ./2.7-exclude.sh
+
+# Test directory setup
+srcdir=$(dirname $me)
+cd $srcdir
+fulldir=$(pwd)
+
+# DECOMPILER=uncompyle2
+DECOMPILER=${DECOMPILER:-"$fulldir/../../bin/uncompyle6"}
+OPTS=${OPTS:-""}
+TESTDIR=/tmp/test2.7
+if [[ -e $TESTDIR ]] ; then
+    rm -fr $TESTDIR
+fi
+
+mkdir $TESTDIR || exit $?
+(cd /usr/local/lib/python2.7/site-packages && cp */test*.pyc $TESTDIR)
+(cd /usr/local/lib/python2.7/site-packages && cp */*/test*.pyc $TESTDIR)
+cd $TESTDIR
+export PATH=/usr/local/bin/python:${PATH}
+
+DONT_SKIP_TESTS=${DONT_SKIP_TESTS:-0}
+
+# Run tests
+typeset -i i=0
+typeset -i allerrs=0
+if [[ -n $1 ]] ; then
+    files=$@
+    typeset -a files_ary=( $(echo $@) )
+    if (( ${#files_ary[@]} == 1 || DONT_SKIP_TESTS == 1 )) ; then
+	SKIP_TESTS=()
+    fi
+elif [[ "$CIRCLECI" == "true" ]] ; then
+    files=$(echo test_*.pyc)
+else
+    files=$(echo test_*.py)
+fi
+
+typeset -i ALL_FILES_STARTTIME=$(date +%s)
+typeset -i skipped=0
+
+NOT_INVERTED_TESTS=${NOT_INVERTED_TESTS:-1}
+
+for file in $files; do
+    # If the fails *before* decompiling, skip it!
+    typeset -i STARTTIME=$(date +%s)
+    if [ ! -r $file ]; then
+	echo "Skipping test $file -- not readable. Does it exist?"
+	continue
+    elif ! $PYTHON $file >/dev/null 2>&1 ; then
+	echo "Skipping test $file -- it fails on its own"
+	continue
+    fi
+    typeset -i ENDTIME=$(date +%s)
+    typeset -i time_diff
+    (( time_diff =  ENDTIME - STARTTIME))
+    if (( time_diff > timeout )) ; then
+	echo "Skipping test $file -- test takes too long to run: $time_diff seconds"
+	continue
+    fi
+
+    ((i++))
+    # (( i > 40 )) && break
+    short_name=$(basename $file .py)
+    if ((IS_PYPY)); then
+	decompiled_file=$short_name-${MAJOR}.${MINOR}.pyc
+    else
+	decompiled_file=$short_name-${PYVERSION}.pyc
+    fi
+    $fulldir/compile-file.py $file && \
+    mv $file{,.orig} && \
+    echo ==========  $(date +%X) Decompiling $file ===========
+    $DECOMPILER $OPTS $decompiled_file > $file 2>/dev/null
+    rc=$?
+    if (( rc == 0 )) ; then
+	echo ========== $(date +%X) Running $file ===========
+	timeout_cmd $PYTHON $file
+	rc=$?
+    else
+	echo ======= Skipping $file due to compile/decompile errors ========
+    fi
+    (( rc != 0 && allerrs++ ))
+    if (( STOP_ONERROR && rc )) ; then
+	echo "** Ran $i tests before failure. Skipped $skipped test for known failures. **"
+	exit $allerrs
+    fi
+done
+typeset -i ALL_FILES_ENDTIME=$(date +%s)
+
+(( time_diff =  ALL_FILES_ENDTIME - ALL_FILES_STARTTIME))
+
+printf "Ran $i unit-test files, $allerrs errors; Elapsed time: "
+displaytime $time_diff
+echo "Skipped $skipped test for known failures."
+exit $allerrs

test/stdlib/runtests.sh

@@ -19,15 +19,19 @@ function displaytime {
   local H=$((T/60/60%24))
   local M=$((T/60%60))
   local S=$((T%60))
-  (( $D > 0 )) && printf '%d days ' $D
-  (( $H > 0 )) && printf '%d hours ' $H
-  (( $M > 0 )) && printf '%d minutes ' $M
-  (( $D > 0 || $H > 0 || $M > 0 )) && printf 'and '
+  (( D > 0 )) && printf '%d days ' $D
+  (( H > 0 )) && printf '%d hours ' $H
+  (( M > 0 )) && printf '%d minutes ' $M
+  (( D > 0 || H > 0 || M > 0 )) && printf 'and '
   printf '%d seconds\n' $S
 }
 
 # Python version setup
-FULLVERSION=$(pyenv local)
+if [[ "$CIRCLECI" == "true" ]]; then
+    FULLVERSION=$(pyenv local)
+else
+    FULLVERSION=$(pyenv local)
+fi
 PYVERSION=${FULLVERSION%.*}
 
 if [[ $PYVERSION =~ 'pypy' ]] ; then
@@ -225,7 +229,7 @@ for file in $files; do
     typeset -i ENDTIME=$(date +%s)
     typeset -i time_diff
     (( time_diff =  ENDTIME - STARTTIME))
-    if (( time_diff > $timeout )) ; then
+    if (( time_diff > timeout )) ; then
 	echo "Skipping test $file -- test takes too long to run: $time_diff seconds"
 	continue
     fi
@@ -241,7 +245,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-xpython.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+# Checks xpython passes all runnable bytecode here
+
+for dir in bytecode_*_run; do
+    for file in ${dir}/*.pyc; do
+	echo $file
+	if ! xpython $file; then
+	    break
+	fi
+    done
+done