Merge branch 'master' of github.com:rocky/python3-trepan

Author: rocky

__pkginfo__.py

@@ -54,6 +54,7 @@
     "Programming Language :: Python :: 3.6 ",
     "Programming Language :: Python :: 3.7 ",
     "Programming Language :: Python :: 3.8 ",
+    "Programming Language :: Python :: 3.9 ",
 ]
 
 # The rest in alphabetic order
@@ -76,6 +77,7 @@
     "pygments %s" % pygments_version,
     "spark_parser >= 1.8.9, <1.9.0",
     "tracer >= 0.3.2",
+    "term-background >= 1.0.1",
     "uncompyle6 >= 3.7.4",
 ]
 license = "GPL3"

test/unit/test-lib-eval.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-'Unit test for trepan.lib.eval'
+"Unit test for trepan.lib.eval"
 import unittest
 
 from trepan.lib import eval as Meval
@@ -8,18 +8,23 @@
 class TestExtractExpression(unittest.TestCase):
     def test_extract_expression(self):
         for fragment, expect in (
-            ('if condition(x):',     'condition(x)'),
-            ('elif is_magic(name):', 'is_magic(name)'),
-            ('while expression:',    'expression'),
-            ('for i in range(3):',   'range(3)'),
-            ('abc = 123',            '123'),
-            ('assert True',          'True'),
-            ('return return_value',  'return_value'),
-            ('nothing_to_be.done',   'nothing_to_be.done'), ):
-            self.assertEqual(expect , Meval.extract_expression(fragment))
+            ("if condition(x):", "condition(x)"),
+            ("elif is_magic(name):", "is_magic(name)"),
+            ("while expression:", "expression"),
+            ("for i in range(3):", "range(3)"),
+            ("and x > 3", "x > 3"),
+            ("or y < 3", "y < 3"),
+            ("abc = 123", "123"),
+            ("assert True", "True"),
+            ("return return_value", "return_value"),
+            ("nothing_to_be.done", "nothing_to_be.done"),
+        ):
+            self.assertEqual(expect, Meval.extract_expression(fragment))
             pass
         pass
+
     pass
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     unittest.main()

trepan/inout/output.py

@@ -30,6 +30,8 @@ def __init__(self, out=None, opts=None):
         self.flush_after_write = False
         self.output = out or sys.stdout
         self.open(self.output, opts)
+        if hasattr(self.output, "isatty"):
+            self.isatty = self.output.isatty
         return
 
     def flush(self):

trepan/interfaces/user.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #   Copyright (C) 2009-2010, 2013-2015,
-#   2017-2018 Rocky Bernstein <rocky@gnu.org>
+#   2017-2018, 2020 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
@@ -89,7 +89,7 @@ def close(self):
         return
 
     def confirm(self, prompt, default):
-        """ Called when a dangerous action is about to be done, to make
+        """Called when a dangerous action is about to be done, to make
         sure it's okay. Expect a yes/no answer to `prompt' which is printed,
         suffixed with a question mark and the default value.  The user
         response converted to a boolean is returned."""
@@ -114,9 +114,20 @@ def confirm(self, prompt, default):
             pass
         return default
 
-    def errmsg(self, msg, prefix="** "):
-        """Common routine for reporting debugger error messages.
+    def msg(self, msg):
+        """used to write to a debugger that is connected to this
+        server; `str' written will have a newline added to it
         """
+        super().msg(msg)
+        # from pydoc import ttypager
+        # if hasattr(self.output, "isatty"):
+        #     ttypager(msg)
+        #     super().msg("")
+        # else:
+        #     super().msg(msg)
+
+    def errmsg(self, msg, prefix="** "):
+        """Common routine for reporting debugger error messages."""
         return self.msg("%s%s" % (prefix, msg))
 
     def finalize(self, last_wishes=None):

trepan/lib/core.py

@@ -27,6 +27,7 @@
 import os.path as osp
 
 # External packages
+import pyficache
 import tracer
 
 # Our local modules
@@ -174,6 +175,8 @@ def canonic(self, filename):
                 pass
             canonic = osp.realpath(osp.normcase(canonic))
             self.filename_cache[filename] = canonic
+        canonic = pyficache.unmap_file(canonic)
+
         return canonic
 
     def canonic_filename(self, frame):

trepan/lib/default.py

@@ -19,7 +19,7 @@
 import os, tracer
 from columnize import computed_displaywidth
 
-from trepan.lib.term_background import is_dark_background
+from term_background import is_dark_background
 
 width = computed_displaywidth()
 

trepan/lib/eval.py

@@ -13,47 +13,56 @@
 #
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''Things related to eval/exec'''
+"""Things related to eval/exec"""
 
 # extract the "expression" part of a line of source code.
 #
 import re
 
 
 def extract_expression(text):
-    if re.search('^\s*(?:if|elif)\s+', text):
-        text = re.sub('^\s*(?:if|elif)\s+', '', text)
-        text = re.sub(':(?:\s+.*$|$)', '', text)
-    elif re.search('^\s*assert\s+.*', text):
+    if re.search("^\s*(?:if|elif)\s+", text):
+        text = re.sub("^\s*(?:if|elif)\s+", "", text)
+        text = re.sub(":(?:\s+.*$|$)", "", text)
+    elif re.search("^\s*assert\s+.*", text):
         # EXPR in : assert EXPRESSION:
-        text = re.sub('^\s*assert\s+', '', text)
-    elif re.search('^\s*(?:while)\s+', text):
-        text = re.sub('^\s*(?:while)\s+', '', text)
-        text = re.sub(':(?:\s+.*$|$)', '', text)
-    elif re.search('^\s*return\s+', text):
+        text = re.sub("^\s*assert\s+", "", text)
+    elif re.search("^\s*(?:while)\s+", text):
+        text = re.sub("^\s*(?:while)\s+", "", text)
+        text = re.sub(":(?:\s+.*$|$)", "", text)
+    elif re.search("^\s*return\s+", text):
         # EXPRESION in: return EXPRESSION
-        text = re.sub('^\s*return\s+', '', text)
-    elif re.search('^\s*for\s+.+\s+in\s+.*:', text):
+        text = re.sub("^\s*return\s+", "", text)
+    elif re.search("^\s*for\s+.+\s+in\s+.*:", text):
         # EXPRESION in: for VAR in EXPRESSION:
-        text = re.sub('^\s*for\s+.+\s+in\s+', '', text)
-        text = re.sub(':.*$', '', text)
-    elif re.search('\s*[A-Za-z_][A-Za-z0-9_\[\]]*\s*=[^=>]', text):
+        text = re.sub("^\s*for\s+.+\s+in\s+", "", text)
+        text = re.sub(":.*$", "", text)
+    elif re.search("^\s*and\s+.*", text):
+        # EXPRESION in: and EXPRESSION
+        text = re.sub("^\s*and\s+", "", text)
+    elif re.search("^\s*or\s+.*", text):
+        # EXPRESION in: and EXPRESSION
+        text = re.sub("^\s*or\s+", "", text)
+    elif re.search("\s*[A-Za-z_][A-Za-z0-9_\[\]]*\s*=[^=>]", text):
         # RHS of an assignment statement.
-        text = re.sub('^\s*[A-Za-z_][A-Za-z0-9_\[\]]*\s*=\s*', '', text)
+        text = re.sub("^\s*[A-Za-z_][A-Za-z0-9_\[\]]*\s*=\s*", "", text)
         pass
     return text
 
 
 # Demo it
-if __name__=='__main__':
+if __name__ == "__main__":
     for stmt in (
-        'if condition(x):',
-        'elif _is_magic(name):',
-        'while expression:',
-        'for i in range(3):',
-        'abc = 123',
-        'return return_value',
-        'nothing_to_be.done'):
+        "if condition(x):",
+        "elif _is_magic(name):",
+        "while expression:",
+        "for i in range(3):",
+        "and x > 3",
+        "or y < 3",
+        "abc = 123",
+        "return return_value",
+        "nothing_to_be.done",
+    ):
         print(extract_expression(stmt))
         pass
     pass

trepan/lib/stack.py

@@ -229,9 +229,12 @@ def check_path_with_frame(frame, path):
     if bc_size and bc_size != my_size:
         return False, "bytecode and local files mismatch"
     if fs_size and fs_size != my_size:
-        return False, (
-            "frame file size, %d bytes, and local file size, %d bytes, on file %s mismatch"
-            % (fs_size, my_size, path)
+        return (
+            False,
+            (
+                "frame file size, %d bytes, and local file size, %d bytes, on file %s mismatch"
+                % (fs_size, my_size, path)
+            ),
         )
     return True, None
 

trepan/lib/term_background.py

@@ -229,6 +229,8 @@ def print_location(proc_obj):
                     remapped_file = None
                     pass
                 pass
+            elif pyficache.main.remap_re_hash:
+                remapped_file = pyficache.remap_file_pat(filename, pyficache.main.remap_re_hash)
             elif m and m.group(1) in sys.modules:
                 remapped_file = m.group(1)
                 pyficache.remap_file(filename, remapped_file)
@@ -390,6 +392,7 @@ def __init__(self, core_obj, opts=None):
 
         self.preloop_hooks = []
         self.postcmd_hooks = []
+        self.remap_file_re = None
 
         self._populate_cmd_lists()
 
@@ -443,6 +446,13 @@ def add_preloop_hook(self, hook, position=-1, nodups=True):
         self.preloop_hooks.insert(position, hook)
         return True
 
+    def add_remap_pat(self, pat, replace, clear_remap=True):
+        self.remap_re_hash[re.compile(pat)] = (pat, replace)
+        pyficache.main.add_remap_pat(pat, replace, clear_remap)
+        if clear_remap:
+             self.file2file_remap = {}
+             pyficache.file2file_remap = {}
+
     # To be overridden in derived debuggers
     def defaultFile(self):
         """Produce a reasonable default."""