X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=lib%2Fpython%2Finit.py;h=8720caa9bf1120075310a8a54296704b47e7332b;hb=1decc13ba58c32545eef28b695083f4c697ba87d;hp=9d20cd636a55c7a17bf0d9f8fcf65e44c7e7d5d2;hpb=4c441cd4be6ccb740cafea910766622ebea6d306;p=dotfiles.git

diff --git a/lib/python/init.py b/lib/python/init.py
index 9d20cd6..8720caa 100644
--- a/lib/python/init.py
+++ b/lib/python/init.py
@@ -36,11 +36,21 @@ def init():
                 or os.path.expanduser('~/.inputrc')
             readline.read_init_file(initfile)
 
-            histfile = os.path.expanduser('~/.python_history')
-            try:
-                readline.read_history_file(histfile)
-            except IOError:
-                pass  # No such file
+            # if 'libedit' in readline.__doc__:
+            #     readline.parse_and_bind("bind ^I rl_complete")
+            # else:
+            #     readline.parse_and_bind("tab: complete")
+
+            histfiles = ['~/.python_history']
+            # if 'VIRTUAL_ENV' in os.environ:
+            #     histfiles.append('$VIRTUAL_ENV/.python_history')
+            for histfile in histfiles:
+                try:
+                    histfile = os.path.expandvars(histfile)
+                    histfile = os.path.expanduser(histfile)
+                    readline.read_history_file(histfile)
+                except IOError:
+                    pass  # No such file
 
             def savehist():
                 histsize = os.environ.get('HISTSIZE')
@@ -51,7 +61,13 @@ def init():
                         pass
                     else:
                         readline.set_history_length(histsize)
-                readline.write_history_file(histfile)
+                histfile = histfiles[-1]
+                histfile = os.path.expandvars(histfile)
+                histfile = os.path.expanduser(histfile)
+                try:
+                    readline.write_history_file(histfile)
+                except IOError:
+                    pass
 
             import atexit
             atexit.register(savehist)
@@ -72,10 +88,13 @@ def init():
     # From Randall Hopper:
     # https://mail.python.org/pipermail/python-list/2001-March/112696.html
 
+    _term_found = False
     for _term in ['linux', 'rxvt', 'screen', 'term', 'vt100']:
-        if _term not in term:
-            continue
+        if _term in term:
+            _term_found = True
+            break
 
+    if _term_found:
         if background == 'dark':
             ps1_color = '3'  # yellow
             stdout_color = '7'  # bold white
@@ -107,7 +126,24 @@ def init():
         sys.stdout = ColoredFile(sys.stdout, '\033[1;3%sm' % stdout_color)
         sys.stderr = ColoredFile(sys.stderr, '\033[31m')  # red
 
-        break
+        def myinput(prompt=None):
+            save_stdout = sys.stdout
+            sys.stdout = sys.__stdout__
+            try:
+                result = builtin_input(prompt)
+            except EOFError:
+                result = None
+            sys.stdout = save_stdout
+            return result
+
+        try:
+            builtins.raw_input
+        except AttributeError:  # PY3
+            builtin_input = builtins.input
+            builtins.input = myinput
+        else:
+            builtin_input = builtins.raw_input
+            builtins.raw_input = myinput
 
     try:
         import locale
@@ -170,7 +206,7 @@ def init():
         pager = Pager()
         try:
             pager.pprint(value)
-        except:
+        except:  # noqa
             pager.stdout = ColoredFile(pager.stdout, '\033[31m')  # red
             print_exc(file=pager)
         pager.close()
@@ -187,13 +223,13 @@ def init():
 
     sys.excepthook = excepthook
 
-    #try:
-    #    import cgitb
-    #except ImportError:
-    #    pass
-    #else:
-    #    # cgitb.enable() overrides sys.excepthook
-    #    cgitb.enable(format='text')
+    # 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
@@ -263,10 +299,6 @@ def init():
 
     builtins.x = _Exit()
 
-    # In Python 2.5+ exit and quit are objects
-    if isinstance(builtins.exit, str):
-        builtins.exit = builtins.quit = x  # noqa: x is defined as _Exit
-
     # print conten of a file
 
     class _Cat: