Administrivia

Workflows CI: go back to released versions rather than github versions
pyenv-newest-versions: updaed to use newest Python releases
pypy38.py: fix wrong package name import
3.6-exclude.sh: update and advance

.github/workflows/osx.yml

@@ -23,7 +23,7 @@ jobs:
       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 git+https://github.com/rocky/python-xdis#egg=xdis
         pip install -e .
         pip install -r requirements-dev.txt
     - name: Test uncompyle6

.github/workflows/ubuntu.yml

@@ -22,7 +22,7 @@ jobs:
       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 git+https://github.com/rocky/python-xdis#egg=xdis
         pip install -e .
         pip install -r requirements-dev.txt
     - name: Test uncompyle6

.github/workflows/windows.yml

@@ -23,7 +23,7 @@ jobs:
       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 git+https://github.com/rocky/python-xdis#egg=xdis
         pip install -e .
         pip install -r requirements-dev.txt
     - name: Test uncompyle6

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 3.7.13 pypy3.6-7.3.0 pyston-2.3.2 3.8.13 3.9.12 3.10.4'
+export PYVERSIONS='3.6.15 pypy3.6-7.3.1 3.7.13 pypy3.8-7.3.9 pyston-2.3.3 3.8.13'

test/stdlib/3.7-exclude.sh

@@ -127,7 +127,6 @@ SKIP_TESTS=(
     [test_traceback.py]=1 # Probably uses comment for testing
     [test_tracemalloc.py]=1 # test assert failres
     [test_ttk_guionly.py]=1  # implementation specfic and test takes too long to run: 19 seconds
-    [test_ttk_guionly.py]=1  # implementation specfic and test takes too long to run: 19 seconds
     [test_typing.py]=1 # parse error
     [test_types.py]=1 # parse error
 

uncompyle6/scanners/pypy38.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2021 by Rocky Bernstein
+#  Copyright (c) 2021-2022 by Rocky Bernstein
 """
 Python PyPy 3.8 decompiler scanner.
 
@@ -6,7 +6,7 @@ Does some additional massaging of xdis-disassembled instructions to
 make things easier for decompilation.
 """
 
-import decompyle3.scanners.scanner38 as scan
+import uncompyle6.scanners.scanner38 as scan
 
 # bytecode verification, verify(), uses JUMP_OPS from here
 from xdis.opcodes import opcode_38pypy as opc