X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=lib%2Fpython%2Finit.py;h=7377a26912ec83ab2d87abc833b36a211460f244;hb=f9b42a2b3f0fa5719d13bc54179bb9b5d8315c11;hp=363a10a1e6d0aaf8ceb66e64dda3296d44f0dc3b;hpb=580013920401a783a31124a179d328fc68952d31;p=dotfiles.git

diff --git a/lib/python/init.py b/lib/python/init.py
index 363a10a..7377a26 100644
--- a/lib/python/init.py
+++ b/lib/python/init.py
@@ -9,7 +9,10 @@
 
 
 def init():
-    import __builtin__
+    try:
+        import __builtin__ as builtins
+    except ImportError:
+        import builtins
     import os
     import sys
 
@@ -27,27 +30,27 @@ def init():
         # https://mail.python.org/pipermail/python-list/2001-March/062888.html
 
         try:
+            import rlcompleter  # noqa: need for completion
             import readline
             initfile = os.environ.get('INPUTRC') \
                 or os.path.expanduser('~/.inputrc')
             readline.read_init_file(initfile)
 
-            histfile = os.path.expanduser('~/.python-history')
+            histfile = os.path.expanduser('~/.python_history')
             try:
                 readline.read_history_file(histfile)
             except IOError:
                 pass  # No such file
 
             def savehist():
-                histfilesize = os.environ.get('HISTFILESIZE') \
-                    or os.environ.get('HISTSIZE')
-                if histfilesize:
+                histsize = os.environ.get('HISTSIZE')
+                if histsize:
                     try:
-                        histfilesize = int(histfilesize)
+                        histsize = int(histsize)
                     except ValueError:
                         pass
                     else:
-                        readline.set_history_length(histfilesize)
+                        readline.set_history_length(histsize)
                 readline.write_history_file(histfile)
 
             import atexit
@@ -113,18 +116,86 @@ def init():
     else:
         try:
             locale.setlocale(locale.LC_ALL, '')
+        except (ImportError, locale.Error):
+            pass  # no locale support or unsupported locale
 
-            from pprint import pprint
+    # set displayhook and excepthook
 
-            def displayhook(value):
-                if value is not None:
-                    __builtin__._ = value
-                    pprint(value)
+    from pprint import pprint
+    pager = os.environ.get("PAGER") or 'more'
 
-            sys.displayhook = displayhook
+    # if your pager is 'less', options '-F' and '-R' must be passed to it,
+    # and option '-X' is very much recommended
+    if pager == 'less':
+        less = os.environ.get("LESS") or ''
+        for opt in 'X', 'R', 'F':
+            if opt not in less:
+                less = opt + less
+        os.environ["LESS"] = less
 
-        except (ImportError, locale.Error):
-            pass  # no locale support or unsupported locale
+    class BasePager:
+        def write(self, value):
+            self.stdin.write(value)
+
+        def pprint(self, value):
+            pprint(value, stream=self.stdin)
+
+        def close(self):
+            self.stdin.close()
+
+    try:
+        from subprocess import Popen, PIPE
+    except ImportError:
+        class Pager(BasePager):
+            def __init__(self):
+                self.pipe = Popen(pager, shell=True, stdin=PIPE)
+                self.stdin = self.pipe.stdin
+
+            def close(self):
+                BasePager.close(self)
+                self.pipe.wait()
+    else:
+        class Pager(BasePager):
+            def __init__(self):
+                self.stdin = os.popen(pager, 'w')
+
+    def displayhook(value):
+        if value is not None:
+            builtins._ = value
+        pager = Pager()
+        pager.pprint(value)
+        pager.close()
+
+    sys.displayhook = displayhook
+
+    from traceback import format_exception
+
+    def excepthook(etype, evalue, etraceback):
+        lines = format_exception(etype, evalue, etraceback)
+        pager = Pager()
+        for line in lines:
+            pager.write(
+                '\033[31m' + line.rstrip('\n') + '\033[0m\n')  # red, reset
+        pager.close()
+
+    sys.excepthook = excepthook
+
+    #try:
+    #    import cgitb
+    #except ImportError:
+    #    pass
+    #else:
+    #    # cgitb.enable() overrides sys.excepthook
+    #    cgitb.enable(format='text')
+
+    # From Thomas Heller:
+    # https://mail.python.org/pipermail/python-list/2001-April/099020.html
+
+    # import pdb
+    #
+    # def info(*args):
+    #    pdb.pm()
+    # sys.excepthook = info
 
     # utilities
 
@@ -160,17 +231,8 @@ def init():
             path = os.path.expanduser(os.path.expandvars(path or '~'))
             os.chdir(path)
 
-    __builtin__.ls = DirLister()
-    __builtin__.cd = DirChanger()
-
-    # From Thomas Heller:
-    # https://mail.python.org/pipermail/python-list/2001-April/099020.html
-
-    # import pdb
-    #
-    # def info(*args):
-    #    pdb.pm()
-    # sys.excepthook = info
+    builtins.ls = DirLister()
+    builtins.cd = DirChanger()
 
     # print working directory
 
@@ -181,7 +243,7 @@ def init():
         def __call__(self):
             return repr(self)
 
-    __builtin__.pwd = Pwd()
+    builtins.pwd = Pwd()
 
     # exit REPL with 'exit', 'quit' or simple 'x'
 
@@ -192,11 +254,11 @@ def init():
         def __call__(self, msg=None):
             sys.exit(msg)
 
-    __builtin__.x = _Exit()
+    builtins.x = _Exit()
 
     # In Python 2.5+ exit and quit are objects
-    if isinstance(__builtin__.exit, str):
-        __builtin__.exit = __builtin__.quit = x  # noqa: x is defined as _Exit
+    if isinstance(builtins.exit, str):
+        builtins.exit = builtins.quit = x  # noqa: x is defined as _Exit
 
     # print conten of a file
 
@@ -208,9 +270,9 @@ def init():
             fp = open(filename, 'rU')
             text = fp.read()
             fp.close()
-            print text
+            print(text)
 
-    __builtin__.cat = _Cat()
+    builtins.cat = _Cat()
 
     # call shell
 
@@ -222,7 +284,7 @@ def init():
         def __call__(self, cmdline):
             os.system(cmdline)
 
-    __builtin__.sh = _Sh()
+    builtins.sh = _Sh()
 
     # paginate a file
 
@@ -231,10 +293,9 @@ def init():
             return "Usage: pager('filename')"
 
         def __call__(self, filename):
-            pager = os.environ.get("PAGER") or 'more'
             os.system("%s '%s'" % (pager, filename.replace("'", '"\'"')))
 
-    __builtin__.pager = _Pager()
+    builtins.pager = _Pager()
 
     # edit a file
 
@@ -247,7 +308,7 @@ def init():
                 or os.environ.get("EDITOR") or 'vi'
             os.system("%s '%s'" % (editor, filename.replace("'", '"\'"')))
 
-    __builtin__.edit = __builtin__.editor = _Editor()
+    builtins.edit = builtins.editor = _Editor()
 
 
 init()