diff options
| author | doko@ubuntu.com <doko@ubuntu.com> | 2016-06-14 07:03:52 (GMT) |
|---|---|---|
| committer | doko@ubuntu.com <doko@ubuntu.com> | 2016-06-14 07:03:52 (GMT) |
| commit | c8fd1928d0e435d10d3743773ea8707f6beecede (patch) | |
| tree | 37af501bbb550dbc697e4d77affd869a8b4120c0 /Lib/pydoc.py | |
| parent | 5553231b91e05cf93827b33a79aebe62c4370a09 (diff) | |
| download | cpython-c8fd1928d0e435d10d3743773ea8707f6beecede.zip cpython-c8fd1928d0e435d10d3743773ea8707f6beecede.tar.gz cpython-c8fd1928d0e435d10d3743773ea8707f6beecede.tar.bz2 | |
- 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 de0084c..d7a177f 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': |