X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=lib%2Fpython%2Finit.py;h=8720caa9bf1120075310a8a54296704b47e7332b;hp=71526b9198f4a4e8d1ce5d44b9860b0abaa899f2;hb=d8287834ddacf040f108186c203e3593096ca8f5;hpb=02382ef710f05b6939bdc54b9b1ab7ef248dc104

diff --git a/lib/python/init.py b/lib/python/init.py
index 71526b9..8720caa 100644
--- a/lib/python/init.py
+++ b/lib/python/init.py
@@ -36,16 +36,22 @@ 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')
                 if histsize:
@@ -55,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)