Use bpython.pager.get_pager_command

sebastinas · sebastinas · commit ee91bf193ca5 · 2015-01-11T06:16:31.000+01:00
And use shlex to split PAGER

Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -34,6 +34,7 @@
 from bpython import translations; translations.init()
 from bpython.translations import _
 from bpython._py3compat import py3
+from bpython.pager import get_pager_command
 
 from bpython.curtsiesfrontend import replpainter as paint
 from bpython.curtsiesfrontend import sitefix; sitefix.monkeypatch_quit()
@@ -1350,7 +1351,7 @@ def focus_on_subprocess(self, args):
             signal.signal(signal.SIGWINCH, prev_sigwinch_handler)
 
     def pager(self, text):
-        command = os.environ.get('PAGER', 'less -rf').split()
+        command = get_pager_command()
         with tempfile.NamedTemporaryFile() as tmp:
             tmp.write(text)
             tmp.flush()
diff --git a/bpython/pager.py b/bpython/pager.py
@@ -27,10 +27,10 @@
 import pydoc
 import subprocess
 import sys
+import shlex
 
-
-def get_pager_command():
-    command = os.environ.get('PAGER', 'less -r').split()
+def get_pager_command(default='less -r'):
+    command = shlex.split(os.environ.get('PAGER', default))
     return command
 
 
