X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=lib%2Fpython%2Finit.py;h=a6c2388cb9824bbd070e73692dc6d88d17ed55d8;hb=6edf846e3fd0060b3ab79da7535df36d1dca687a;hp=a38cea39332d3904ffd2313d2abfc4e6607688fb;hpb=702b527246987a7efc3d7e939d02c8b8111eccb1;p=dotfiles.git diff --git a/lib/python/init.py b/lib/python/init.py index a38cea3..a6c2388 100644 --- a/lib/python/init.py +++ b/lib/python/init.py @@ -36,6 +36,11 @@ def init(): or os.path.expanduser('~/.inputrc') readline.read_init_file(initfile) + #if 'libedit' in readline.__doc__: + # readline.parse_and_bind("bind ^I rl_complete") + #else: + # readline.parse_and_bind("tab: complete") + histfile = os.path.expanduser('~/.python_history') try: readline.read_history_file(histfile) @@ -72,10 +77,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 @@ -110,7 +118,10 @@ def init(): def myinput(prompt=None): save_stdout = sys.stdout sys.stdout = sys.__stdout__ - result = builtin_input(prompt) + try: + result = builtin_input(prompt) + except EOFError: + result = None sys.stdout = save_stdout return result @@ -123,8 +134,6 @@ def init(): builtin_input = builtins.raw_input builtins.raw_input = myinput - break - try: import locale except ImportError: