[pull] master from rocky:master

.circleci/config.yml

@@ -16,60 +16,66 @@ 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: cimg/python:3.13
     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-
+      # 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
-          pip install --user --upgrade setuptools
-          pip install --user -e .
-          pip install --user -r requirements-dev.txt
+      - run:
+          command: | # Use pip to install dependengcies
+            # pip install --user --upgrade setuptools
+            pip install --user -e git+https://github.com/rocky/python-xdis.git#egg=xdis
+            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
+      # 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
+      # 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: pip install -e . && 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/FUNDING.yml

@@ -6,7 +6,7 @@ open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
+liberapay: rocky
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
 custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/bug-report.md

@@ -5,26 +5,32 @@ about: Tell us about uncompyle6 bugs
 ---
 
 <!-- __Note:__ If you are using this program to do something illegal - don't.
-The issue may flagged to make it easier for those looking for illegal activity.
+The issue may be flagged to make it easier for those seeking to report illegal activity.
 
-Bugs are not for asking questions about a problem you
-are trying to solve that involve the use of uncompyle6 along the way,
-although I may be more tolerent of this if you sponsor the project.
+If you are reporting a bug in decompilation, it will probably not be acted upon
+unless it is narrowed to a small example. You may have to do some work to remove
+extraneous code from the source example. Most bugs can be expressed in 30 lines of
+code.
 
-Also, the unless you are a sponsor of the project, it may take a
+Issues are not for asking questions about a problem you are trying to solve that involves the use of uncompyle6 along the way, although I may be more tolerant of this if you sponsor the project.
+
+Bugs are also not for general or novice help on how to install
+this Python program and its dependencies in your environment, or in
+the way you would like to have it set up, or how to interpret a Python
+traceback, e.g., that winds up saying Python X.Y.Z is not supported.
+
+For these kinds of things, you will save yourself time by asking instead on forums like StackOverflow or ChatGPT that are geared to helping people with such general or novice kinds of questions and tasks. And unless you are a sponsor of the project, if your question seems to be of this category, the issue may just be closed.
+
+Also, unless you are a sponsor of the project, it may take a
 while, maybe a week or so, before the bug report is noticed, let alone
 acted upon.
 
-To set expectations, some legitimate bugs can take years to fix, but
-they eventually do get fixed.
+To set expectations, some legitimate bugs can take years to fix, but most eventually do get fixed.
 
-Funding the project was added to partially address the problem that there are
-lots of people seeking help and reporting bugs, but few people who are
+Funding the project was added to partially address the problem that there are lots of people seeking help and reporting bugs, but few people who are
 willing or capable of providing help or fixing bugs.
 
-Tasks or the kinds of things others can do but you can't do or don't
-want to do yourself are typically the kind of thing that you pay
-someone to do, especially when you are the primary beneficiary of the
+Tasks or the kinds of things others can do, but you can't do or don't want to do yourself, are typically the kind of thing that you pay someone to do, especially when you are the primary beneficiary of the
 work, or the task is complex, long, or tedious. If your code is over
 30 lines long, it fits into this category.
 
@@ -39,37 +45,37 @@ Prerequisites/Caveats
 
 * Make sure the bytecode you have can be disassembled with a
   disassembler and produces valid results.
+* Try to make the bytecode that exhibits a bug as small as possible.
 * Don't put bytecode and corresponding source code on any service that
-  requires registration to download.
-* When you open a bug report there is no privacy. If you need privacy, then
+  requires registration to download. Instead, attach it as a zip file.
+* When you open a bug report, there is no privacy. If you need privacy, then
   contact me by email and explain who you are and the need for privacy.
   But be mindful that you may be asked to sponsor the project for the
   personal and private help that you are requesting.
-* If the legitimacy of the activity is deemed suspicous, I may flag it as suspicious,
-  making the issue even more easy to detect.
+* If the legitimacy of the activity is deemed suspicious, I may flag it as suspicious,
+  making the issue even easier to detect.
 
 Bug reports that violate the above may be discarded.
 
 -->
 
 ## Description
 
-<!-- Please add a clear and concise description of the bug. -->
+<!-- Please add a clear and concise description of the bug. Try to narrow the problem down to the smallest that exhibits the bug.-->
 
 ## How to Reproduce
 
-<!-- Please show both the *input* you gave and the
-output you got in describing how to reproduce the bug:
+<!-- Please show both the *input* you gave and the output you got in describing how to reproduce the bug.
 
-or give a complete console log with input and output
+Or give a complete console log with input and output
 
 ```console
 $ uncompyle6 <command-line-options>
 ...
 $
 ```
 
-Provide links to the Python bytecode. For example you can create a
+Attach a zip file to the Python bytecode or a
 gist with the information. If you have the correct source code, you
 can add that too.
 
@@ -78,8 +84,8 @@ can add that too.
 ## Output Given
 
 <!--
-Please include not just the error message but all output leading to the message which includes echoing input and messages up to the error.
-For a command-line environment include command invocation and all the output produced.
+Please include not just the error message, but all output leading to the message, which includes echoing input and messages up to the error.
+For a command-line environment, include command invocation and all the output produced.
 
 If this is too long, then try narrowing the problem to something short.
 -->
@@ -96,8 +102,9 @@ If this is too long, then try narrowing the problem to something short.
 Please modify for your setup
 
 - Uncompyle6 version: output from  `uncompyle6 --version` or `pip show uncompyle6`
+- xdis version: output from `pydisasm --version` or or `pip show xdis`
 - Python version for the version of Python the byte-compiled the file: `python -c "import sys; print(sys.version)"` where `python` is the correct CPython or PyPy binary.
-- OS and Version: [e.g. Ubuntu bionic]
+- OS and Version: [e.g., Ubuntu bionic]
 
 -->
 
@@ -107,7 +114,11 @@ Please modify for your setup
 
 ## Priority
 
-<!-- If this is blocking some important activity let us know what activity it blocks. -->
+<!-- If this is important for a particular public good state it here.
+     If this is blocking some important activity, let us know what activity it blocks.
+
+	 Otherwise, we'll assume this has the lowest priority in addressing.
+	 -->
 
 ## Additional Context
 

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: False

.github/ISSUE_TEMPLATE/feature-request.md

@@ -14,6 +14,14 @@ include same input and output. -->
 <!-- Add any additional background for the
 feature, for example: user scenarios, or the value of the feature. -->
 
+## Priority
+
+<!-- If this is important for a particular public good state that here.
+     If this is blocking some important activity let us know what activity it blocks.
+
+	 Otherwise, we'll assume this has the lowest priority in addressing.
+	 -->
+
 ## Tests
 <!-- _This section is optional._
 

.github/workflows/osx.yml

@@ -12,19 +12,20 @@ jobs:
     strategy:
       matrix:
         os: [macOS]
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.13]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
         # Until the next xdis release
-        # pip install git+git://github.com/rocky/python-xdis.git#egg=xdis
+        pip install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
         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: |

.github/workflows/ubuntu.yml

@@ -11,19 +11,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.13]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
         # Until the next xdis release
-        # pip install git+git://github.com/rocky/python-xdis.git#egg=xdis
+        pip install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
         pip install -e .
+        # pip install click spark-parser xdis
         pip install -r requirements-dev.txt
     - name: Test uncompyle6
       run: |

.github/workflows/windows.yml

@@ -8,23 +8,24 @@ on:
 
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: windows-latest
     strategy:
       matrix:
         os: [windows]
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.13]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
         # Until the next xdis release
-        # pip install git+git://github.com/rocky/python-xdis.git#egg=xdis
+        pip install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
         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: |

.gitignore

@@ -2,6 +2,7 @@
 *.pyo
 *_dis
 *~
+.mypy_cache
 /.cache
 /.eggs
 /.hypothesis
@@ -10,16 +11,19 @@
 /.pytest_cache
 /.python-version
 /.tox
-.mypy_cache
 /.venv*
+/ChangeLog-spell-corrected
+/ChangeLog.orig
 /README
 /__pkginfo__.pyc
 /dist
 /how-to-make-a-release.txt
 /nose-*.egg
+/pycharm-venv
 /tmp
 /uncompyle6.egg-info
 /unpyc
+/venv
 ChangeLog
 __pycache__
 build

.isort.cfg

@@ -0,0 +1,11 @@
+[settings]
+multi_line_output = 3
+include_trailing_comma = True
+force_grid_wrap = 0
+use_parentheses = True
+line_length = 88
+known_crunch = cr, zz9d, zz9lib, pycrunch, silhouette
+sections = FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,CRUNCH,LOCALFOLDER
+default_section = THIRDPARTY
+combine_as_imports = 1
+profile = black