3.10 compatability and uncompyle6 selection

Author: rocky

__pkginfo__.py

@@ -34,8 +34,6 @@
     pygments_version = ">= 2.2.0"
     if (3, 7) <= SYS_VERSION < (3, 9):
         decompiler = "decompyle3 >= 3.8.0"
-    else:
-        decompiler = None
 
 
 # Python-version | package  | last-version |

test/unit/test_api.py

@@ -4,7 +4,9 @@
 
 import sys
 
+import pytest
 import tracer
+from xdis import IS_PYPY, PYTHON_VERSION_TRIPLE
 
 from trepan.api import run_call, run_eval
 from trepan.inout.stringarray import StringArrayInput, StringArrayOutput
@@ -15,6 +17,10 @@ def plus5(n: int) -> int:
     return n + 5
 
 
+@pytest.mark.skipif(
+    IS_PYPY and PYTHON_VERSION_TRIPLE < (3, 7, 0),
+    reason="PyPy strings work differently",
+)
 def test_run_xxx():
     """
     test run_eval() and run_call()
@@ -32,12 +38,14 @@ def test_run_xxx():
     print('Issuing: run_eval("1+2")')
     print(run_eval("1+2", debug_opts=debug_opts))
     print(debugger_output.output)
-    start_lineno = "1" if sys.version_info[:2] < (3, 10) else "0"
+    start_lineno = "1" if sys.version_info[:2] < (3, 11) else "0"
+
     assert debugger_output.output[0:3] == [
         "call - <string>:%s" % start_lineno,
         "line - <string>:1",
         "return - <string>:1, 3 ",
     ]
+
     debugger_input = StringArrayInput([""])
     debugger_output = StringArrayOutput()
     debug_opts = {
@@ -49,12 +57,12 @@ def test_run_xxx():
     print('Issuing: run_call(foo, 3")')
     x = run_call(plus5, 3, debug_opts=debug_opts)
     assert x == 8
-    call_lineno = "14"
+    call_lineno = "16"
     for i, (prefix, suffix) in enumerate(
         (
             ("call - ", "test/unit/test_api.py:%s" % call_lineno),
-            ("line - ", "test/unit/test_api.py:15"),
-            ("return - ", "test/unit/test_api.py:15, 8 "),
+            ("line - ", "test/unit/test_api.py:17"),
+            ("return - ", "test/unit/test_api.py:17, 8 "),
         )
     ):
         assert debugger_output.output[i].startswith(prefix), (