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

diff --git a/lib/python/init.py b/lib/python/init.py
index d8b7c79..71526b9 100644
--- a/lib/python/init.py
+++ b/lib/python/init.py
@@ -36,16 +36,15 @@ 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)
             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")
 
             def savehist():
                 histsize = os.environ.get('HISTSIZE')
@@ -77,10 +76,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
@@ -115,21 +117,22 @@ 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
 
         try:
             builtins.raw_input
-        except AttributeError: # PY3
+        except AttributeError:  # PY3
             builtin_input = builtins.input
             builtins.input = myinput
         else:
             builtin_input = builtins.raw_input
             builtins.raw_input = myinput
 
-        break
-
     try:
         import locale
     except ImportError:
@@ -191,7 +194,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()
@@ -208,13 +211,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