diff options
author | doko <doko@ubuntu.com> | 2016-06-14 09:03:52 +0200 |
---|---|---|
committer | doko <doko@ubuntu.com> | 2016-06-14 09:03:52 +0200 |
commit | cca66dc999934b30748111bc26cee19af1ea02cc (patch) | |
tree | 7655d2df070965ae3ce490445f591cb5d1f1811e /Lib/pydoc.py | |
parent | 008c426d4a560e63e9a5c56491de91c72417c68b (diff) | |
download | cpython-cca66dc999934b30748111bc26cee19af1ea02cc.tar.gz |
- Issue #8637: Honor a pager set by the env var MANPAGER (in preference to
one set by the env var PAGER).
Diffstat (limited to 'Lib/pydoc.py')
-rw-r--r-- | Lib/pydoc.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py index de0084c3e5..d7a177f1a2 100644 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1432,11 +1432,11 @@ def getpager(): use_pager = os.environ.get('MANPAGER') or os.environ.get('PAGER') if use_pager: if sys.platform == 'win32': # pipes completely broken in Windows - return lambda text: tempfilepager(plain(text), os.environ['PAGER']) + return lambda text: tempfilepager(plain(text), use_pager) elif os.environ.get('TERM') in ('dumb', 'emacs'): - return lambda text: pipepager(plain(text), os.environ['PAGER']) + return lambda text: pipepager(plain(text), use_pager) else: - return lambda text: pipepager(text, os.environ['PAGER']) + return lambda text: pipepager(text, use_pager) if os.environ.get('TERM') in ('dumb', 'emacs'): return plainpager if sys.platform == 'win32': |