Revise to use xdis 6.0.3

Sync somewhat with trepan3k
cl.py -> __main__.py

Author: rocky

__pkginfo__.py

@@ -23,7 +23,7 @@
 
 # Things that change more often go here.
 copyright = """
-Copyright (C) 2008-2010, 2013-2018, 2020 Rocky Bernstein <rocky@gnu.org>.
+Copyright (C) 2008-2010, 2013-2018, 2020-2021 Rocky Bernstein <rocky@gnu.org>.
 """
 
 classifiers = [
@@ -39,6 +39,7 @@
     "Programming Language :: Python :: 2.5",
     "Programming Language :: Python :: 2.6",
     "Programming Language :: Python :: 2.7",
+    "Programming Language :: Python :: Implementation :: PyPy",
 ]
 
 # Python-version | package | last-version |
@@ -50,18 +51,26 @@
 # The rest in alphabetic order
 author = "Rocky Bernstein"
 author_email = "rocky@gnu.org"
+
+entry_points = {
+    "console_scripts": [
+        "trepan2  = trepan.__main__:main",
+        "trepan2c = trepan.client:main",
+    ]
+}
+
 ftp_url = None
 install_requires = [
     "columnize >= 0.3.10",
     "nose>=1.0.0, <= 1.3.7",
-    "pyficache >= 2.2.1",
+    "pyficache >= 2.3.0",
     "pygments == 2.2.0",  # Later releases don't support Python 2.7
     "spark_parser >= 1.8.9, <1.9.0",
-    "uncompyle6 >= 3.7.4",
+    "uncompyle6 >= 3.8.0",
     "term-background >= 1.0.1",
     "tracer >= 0.3.2",
     "unittest2",
-    "xdis >= 5.0.4",
+    "xdis >= 6.0.3,<6.1.0",
 ]
 license = "GPL3"
 mailing_list = "python-debugger@googlegroups.com"
@@ -94,7 +103,7 @@ def get_srcdir():
 # trepan/version.py sets variable __version__.
 ns = {}
 exec(open(osp.join(get_srcdir(), "trepan", "version.py")).read(), ns)
-version = ns["__version__"]
+__version__ = ns["__version__"]
 web = "http://github.com/rocky/python2-trepan/"
 
 # tracebacks in zip files are funky and not debuggable

admin-tools/setup-master.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-PYTHON_VERSION=2.7.15
+PYTHON_VERSION=2.7.18
 
 # FIXME put some of the below in a common routine
 function finish {

admin-tools/setup-python-2.4.sh

@@ -18,10 +18,7 @@ if [[ $0 == $bs ]] ; then
 fi
 mydir=$(dirname $bs)
 fulldir=$(readlink -f $mydir)
-cd $fulldir/..
-checkout_version python-spark && \
-checkout_version python-filecache && \
-checkout_version python-xdis && \
-checkout_version python-uncompyle6 && \
-git checkout python-2.4 &&  pyenv local $PYTHON_VERSION && git pull
+(cd $fulldir/.. &&  checkout_version python-spark &&  checkout_version python-filecache &&
+ checkout_version python-xdis && checkout_version python-uncompyle6)
 cd $owd
+git checkout python-2.4 &&  pyenv local $PYTHON_VERSION && git pull

setup.py

@@ -28,14 +28,15 @@
     author,
     author_email,
     classifiers,
+    entry_points,
     install_requires,
     license,
     long_description,
     modname,
     packages,
     py_modules,
     short_desc,
-    version,
+    __version__,
     web,
     zip_safe,
 )
@@ -62,12 +63,7 @@
         )
     ],
     description=short_desc,
-    entry_points={
-        "console_scripts": [
-            "trepan2  = trepan.cli:main",
-            "trepan2c  = trepan.client:main",
-        ]
-    },
+    entry_points=entry_points,
     install_requires=install_requires,
     license=license,
     long_description=long_description,
@@ -76,6 +72,6 @@
     packages=packages,
     test_suite="nose.collector",
     url=web,
-    version=version,
+    version=__version__,
     zip_safe=zip_safe,
 )

test/integration/helper.py

@@ -9,7 +9,7 @@ def run_debugger(testname, python_file, dbgr_opts='', args='',
     datadir   = os.path.join(srcdir, '..', 'data')
     progdir   = os.path.join(srcdir, '..', 'example')
     dbgrdir   = os.path.join(srcdir, '..', '..', 'trepan')
-    dbgr_short= "cli.py"
+    dbgr_short= "__main__.py"
     dbgr_path = os.path.join(dbgrdir, dbgr_short)
 
     if IS_PYPY:

test/unit/test-bytecode.py

@@ -3,7 +3,7 @@
 import inspect, unittest
 
 from trepan.lib import bytecode as Mcode
-from xdis import IS_PYPY, PYTHON_VERSION
+from xdis.version_info import IS_PYPY, PYTHON_VERSION_TRIPLE
 
 
 class TestByteCode(unittest.TestCase):
@@ -22,7 +22,7 @@ def sqr(x):
 
     def test_op_at_frame(self):
         frame = inspect.currentframe()
-        if IS_PYPY or PYTHON_VERSION >= 3.7:
+        if IS_PYPY or PYTHON_VERSION_TRIPLE >= (3, 7):
             call_opcode = 'CALL_METHOD'
         else:
             call_opcode = 'CALL_FUNCTION'

trepan/api.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2008-2009, 2013-2015, 2017 Rocky Bernstein <rocky@gnu.org>
+#   Copyright (C) 2008-2009, 2013-2015, 2017, 2021 Rocky Bernstein <rocky@gnu.org>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -13,10 +13,10 @@
 #
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''Some singleton debugger methods that can be called without first
+"""Some singleton debugger methods that can be called without first
 creating a debugger object -- these methods will create a debugger object,
 if necessary, first.
-'''
+"""
 
 # The following routines could be done via something like the following
 # untested code:
@@ -185,7 +185,7 @@ def debug(dbg_opts=None, start_opts=None, post_mortem=True,
   >>> dbgr
   <trepan.debugger.Debugger instance at 0x2e25320>
 """
-    if Mdebugger.Debugger != type(Mdebugger.debugger_obj):
+    if isinstance(Mdebugger.Debugger, Mdebugger.debugger_obj):
         Mdebugger.debugger_obj = Mdebugger.Debugger(dbg_opts)
         Mdebugger.debugger_obj.core.add_ignore(debug, stop)
         pass
@@ -224,7 +224,7 @@ def stop(opts=None):
     return None
 
 # Demo it
-if __name__=='__main__':
+if __name__== "__main__":
     import tracer
 
     def foo(n):