init.py: Refactor loop over term types

[dotfiles.git] / lib / python / init.py

diff --git a/lib/python/init.py b/lib/python/init.py
index d8b7c79b89ab8bead28dc330db52457019576765..a6c2388cb9824bbd070e73692dc6d88d17ed55d8 100644 (file)
--- a/lib/python/init.py
+++ b/lib/python/init.py
@@ -77,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
@@ -115,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
 
@@ -128,8 +134,6 @@ def init():
             builtin_input = builtins.raw_input
             builtins.raw_input = myinput
 
-        break
-
     try:
         import locale
     except ImportError: