X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpython%2Finit.py;h=a38cea39332d3904ffd2313d2abfc4e6607688fb;hb=702b527246987a7efc3d7e939d02c8b8111eccb1;hp=1697a08d38f364db2e2910a639cfc0ad68765697;hpb=89b04ad56e3c4b9e3073c250bb525051c6f1405b;p=dotfiles.git

diff --git a/lib/python/init.py b/lib/python/init.py
index 1697a08..a38cea3 100644
--- a/lib/python/init.py
+++ b/lib/python/init.py
@@ -107,6 +107,22 @@ def init():
         sys.stdout = ColoredFile(sys.stdout, '\033[1;3%sm' % stdout_color)
         sys.stderr = ColoredFile(sys.stderr, '\033[31m')  # red
 
+        def myinput(prompt=None):
+            save_stdout = sys.stdout
+            sys.stdout = sys.__stdout__
+            result = builtin_input(prompt)
+            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
+
         break
 
     try:
@@ -152,16 +168,17 @@ def init():
     except ImportError:
         class Pager(BasePager):
             def __init__(self):
-                self.pipe = Popen(pager, shell=True, stdin=PIPE)
+                self.stdout = os.popen(pager, 'w')
+    else:
+        class Pager(BasePager):
+            def __init__(self):
+                self.pipe = Popen(pager, shell=True, stdin=PIPE,
+                                  universal_newlines=True)
                 self.stdout = self.pipe.stdin
 
             def close(self):
                 BasePager.close(self)
                 self.pipe.wait()
-    else:
-        class Pager(BasePager):
-            def __init__(self):
-                self.stdout = os.popen(pager, 'w')
 
     def displayhook(value):
         if value is not None:
@@ -262,10 +279,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: