Misc fixes

Update pre-config.yaml
setup-python-3.6.sh - use 3.6 branch now of term-background
__main__.py: better decompiler handling

Author: rocky

.pre-commit-config.yaml

@@ -6,17 +6,17 @@ repos:
     hooks:
     - id: check-merge-conflict
     - id: debug-statements
-      stages: [commit]
+      stages: [pre-commit]
     - id: end-of-file-fixer
-      stages: [commit]
+      stages: [pre-commit]
 -   repo: https://github.com/pycqa/isort
     rev: 5.13.2
     hooks:
       - id: isort
-        stages: [commit]
+        stages: [pre-commit]
 -   repo: https://github.com/psf/black
     rev: 23.12.1
     hooks:
     - id: black
       language_version: python3
-      stages: [commit]
+      stages: [pre-commit]

admin-tools/setup-python-3.6.sh

@@ -11,12 +11,11 @@ fi
 export PATH=$HOME/.pyenv/bin/pyenv:$PATH
 trepan3k_owd=$(pwd)
 mydir=$(dirname $bs)
-cd $mydir
-. ./checkout_common.sh
+. $mydir/checkout_common.sh
 (cd $mydir/../../../rocky && \
      setup_version python-uncompyle6 python-3.6 && \
      setup_version python-filecache python-3.6 && \
-     setup_version shell-term-background python-3.3 && \
+     setup_version shell-term-background python-3.6 && \
      setup_version pytracer python-3.6 \
      setup_version pycolumnize python-3.6 && \
      setup_version python-xdis python-3.6 \

trepan/__main__.py

@@ -153,9 +153,14 @@ def main(dbg=None, sys_argv=list(sys.argv)):
                 sys.exit(3)
             except IOError:
                 decompiler = "uncompyle6"
+                no_decompiler = False
                 try:
                     if (3, 7) <= PYTHON_VERSION_TRIPLE <= (3, 8):
                         from decompyle3 import decompile_file
+                    elif PYTHON_VERSION_TRIPLE >= (3, 9):
+                        decompiler = "No decompiler found"
+                        no_decompiler = True
+                        raise ImportError
                     else:
                         from uncompyle6 import decompile_file
 
@@ -195,14 +200,18 @@ def write_wrapper(*args, **kwargs):
 
                 # from io import StringIO
                 # linemap_io = StringIO()
-                try:
-                    decompile_file(mainpyfile, fd.file, mapstream=fd)
-                    linemaps = decompile_file(mainpyfile, fd.file, mapstream=fd)
-                except Exception:
-                    print(
-                        f"{__title__}: error decompiling '{mainpyfile}'; disassembling instead.",
-                        file=sys.stderr,
-                    )
+                if not no_decompiler:
+                    try:
+                        decompile_file(mainpyfile, fd.file, mapstream=fd)
+                        linemaps = decompile_file(mainpyfile, fd.file, mapstream=fd)
+                    except Exception:
+                        no_decompiler = True
+                        print(
+                            f"{__title__}: error decompiling '{mainpyfile}'; disassembling instead.",
+                            file=sys.stderr,
+                        )
+
+                if no_decompiler:
                     info = disassemble_file(
                         mainpyfile,
                         outstream=fd,