init.py: Remove support for Python <= 2.4

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

diff --git a/lib/python/init.py b/lib/python/init.py
index 1697a08d38f364db2e2910a639cfc0ad68765697..19f02346be99db0af56f66db21fa9813bb023760 100644 (file)
--- a/lib/python/init.py
+++ b/lib/python/init.py
@@ -152,16 +152,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 +263,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: