Merge conflicts

Author: rocky

__pkginfo__.py

@@ -58,7 +58,6 @@
     "pygments == 2.2.0",  # Later releases don't support Python 2.7
     "spark_parser >= 1.8.9, <1.9.0",
     "uncompyle6 >= 3.7.4",
-    "term-background >= 1.0.1",
     "tracer >= 0.3.2",
     "unittest2",
     "xdis >= 5.0.4",

admin-tools/how-to-make-a-release.md

@@ -54,10 +54,10 @@
 # Make packages and tag
 
     $ . ./admin-tools/make-dist-older.sh
-	$ pyenv local 3.8.5 && twine check dist/trepan2-$VERSION* && pyenv local 2.7.18
-    $ git tag release-python-2.4-$VERSION
+	$ pyenv local 3.8.6 && twine check dist/trepan2-$__version__* && pyenv local 2.7.18
+    $ git tag release-python-2.4-$__version__
     $ . ./admin-tools/make-dist-newer.sh
-	$ pyenv local 3.8.5 &&  twine check dist/trepan2-$VERSION* && pyenv local 2.7.18
+	$ pyenv local 3.8.6 &&  twine check dist/trepan2-$__version__* && pyenv local 2.7.18
 
 
 # Check package on github

trepan/cli.py

@@ -17,7 +17,6 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """The command-line interface to the debugger.
 """
-from __future__ import print_function
 import pyficache, os, sys, tempfile
 import os.path as osp
 
@@ -131,16 +130,8 @@ def main(dbg=None, sys_argv=list(sys.argv)):
                 try:
                     from uncompyle6 import decompile_file
                 except ImportError:
-<<<<<<< HEAD
                     sys.stderr.write("%s: Compiled python file '%s', but uncompyle6 not found\n"
                                      % (__title__, mainpyfile))
-=======
-                    print(
-                        "%s: Compiled python file '%s', but uncompyle6 not found"
-                        % (__title__, mainpyfile),
-                        file=sys.stderr,
-                    )
->>>>>>> master
                     sys.exit(1)
                     return
 
@@ -156,47 +147,20 @@ def main(dbg=None, sys_argv=list(sys.argv)):
                     mainpyfile = fd.name
                     fd.close()
                 except:
-<<<<<<< HEAD
                     sys.stderr.write("%s: error uncompyling '%s'\n"
                                      % (__title__, mainpyfile))
-=======
-                    print(
-                        "%s: error uncompiling '%s'" % (__title__, mainpyfile),
-                        file=sys.stderr,
-                    )
-                    fd.close()
-                    os.unlink(fd.name)
-                    # FIXME: remove the below line and continue with just the
-                    # bytecode
->>>>>>> master
                     sys.exit(1)
                 pass
 
         # If mainpyfile is an optimized Python script try to find and
         # use non-optimized alternative.
         mainpyfile_noopt = pyficache.resolve_name_to_path(mainpyfile)
-<<<<<<< HEAD
         if mainpyfile != mainpyfile_noopt \
                and Mfile.readable(mainpyfile_noopt):
             sys.stderr.write("%s: Compiled Python script given and we can't use that.\n"
                              % __title__)
             sys.stderr.write("%s: Substituting non-compiled name: %s\n" %
                              (__title__, mainpyfile_noopt))
-=======
-        if mainpyfile != mainpyfile_noopt and Mfile.readable(mainpyfile_noopt):
-            print(
-                "%s: Compiled Python script given and we can't use that." % __title__,
-                file=sys.stderr,
-            )
-            print(
-                "%s: Substituting non-compiled name: %s"
-                % (
-                    __title__,
-                    mainpyfile_noopt,
-                ),
-                file=sys.stderr,
-            )
->>>>>>> master
             mainpyfile = mainpyfile_noopt
             pass
 

trepan/lib/default.py

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

trepan/lib/term_background.py

@@ -0,0 +1,102 @@
+"""
+Figure out if the terminal has a light or dark background
+
+We consult environemnt variables
+- DARK_BG
+- COLORFGBG
+- TERM
+
+If DARK_BG is set and it isn't 0 then we have a dark background
+else a light background.
+
+If DARK_BG is not set but COLORFGBG is set and it is '0;15' then we have a dark background
+and if it is '15;0' then a light background.
+
+If none of the above work but TERM is set and the terminal understands
+xterm sequences for retrieving foreground and background, we'll
+set based on those colors. Failing that we'll set defaults
+for spefic TERM values based on their default settings.
+
+
+See https://github.com/rocky/bash-term-background for code
+that works in bash.
+"""
+
+from os import environ
+# from subprocess import check_output, check_call
+
+def set_default_bg():
+    """Get bacground from
+    default values based on the TERM environment variable
+    """
+    term = environ.get('TERM', None)
+    if term:
+        if (term.startswith('xterm',) or term.startswith('eterm')
+            or term == 'dtterm'):
+            return False
+    return True
+
+
+def is_dark_rgb(r, g, b):
+    """Pass as parameters R G B values in hex
+    On return, variable is_dark_bg is set
+    """
+    # 117963 = (* .6 (+ 65535 65535 65535))
+    if ( (16*5 + 16*g + 16*b) < 117963 ):
+        return True
+    else:
+        return False
+
+
+def is_dark_color_fg_bg():
+    """Consult (environment) variables DARK_BG and COLORFGB
+    On return, variable is_dark_bg is set"""
+    dark_bg = environ.get('DARK_BG', None)
+    if dark_bg is not None:
+        return dark_bg != '0'
+    color_fg_bg = environ.get('COLORFGBG', None)
+    if color_fg_bg:
+        if color_fg_bg in ('15;0', '15;default;0'):
+            return True
+        elif color_fg_bg in ('0;15', '0;default;15' ):
+            return False
+    else:
+        return True
+    return None
+
+# # From:
+# # http://unix.stackexchange.com/questions/245378/common-environment-variable-to-set-dark-or-light-terminal-background/245381#245381
+# # and:
+# # https://bugzilla.gnome.org/show_bug.cgi?id=733423#c1
+# #
+# # User should set up RGB_fg and RGB_bg arrays
+# def xterm_compatible_fg_bg():
+#     # Issue command to get both foreground and
+#     # background color
+#     #                                           fg        bg
+#     try:
+#         check_call("stty -echo", shell=True)
+#         output = check_output("echo -ne '\033]10;?\07\033]11;?07'", shell=True)
+#     finally:
+#         check_call("stty echo", shell=True)
+
+
+#     # IFS=: read -t 0.1 -d $'\a' x fg
+#     # IFS=: read -t 0.1 -d $'\a' x bg
+#     #     output = check_output("stty echo")
+#     # stty echo
+#     # [[ -z $bg ]] && return 1
+#     # typeset -p fg
+#     # typeset -p bg
+#     # IFS='/' read -ra RGB_fg <<< $fg
+#     # IFS='/' read -ra RGB_bg <<< $bg
+#     # typeset -p RGB_fg
+#     # typeset -p RGB_bg
+#     return None, None, None
+
+def is_dark_background():
+    dark_bg = is_dark_color_fg_bg()
+    if dark_bg is None:
+        dark_bg = set_default_bg()
+    # print("XXX ", dark_bg)
+    return dark_bg

trepan/processor/cmdfns.py

@@ -24,11 +24,8 @@ def source_tempfile_remap(prefix, text, tempdir=None):
     fd = tempfile.NamedTemporaryFile(suffix=".py", prefix=prefix,
                                      dir=tempdir,
                                      delete=False)
-    with fd:
-        fd.write(bytes(text, "UTF-8"))
-        fd.close()
-    finally:
-        fd.close()
+    fd.write(bytes(text, "UTF-8"))
+    fd.close()
     return fd.name
 
 

trepan/processor/cmdproc.py

@@ -205,7 +205,9 @@ def print_location(proc_obj):
                     pass
                 pyficache.remap_file(fd.name, '<string>')
                 remapped = cmdfns.source_tempfile_remap('eval_string',
-
+                                                        dbgr_obj.eval_string,
+                                                        tempdir=proc_obj.settings("tempdir")
+                                                        )
                 pyficache.remap_file(filename, remapped)
                 filename = remapped
                 lineno = pyficache.unmap_file_line(filename, lineno)