diff options
| -rw-r--r-- | Lib/pydoc.py | 3 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 063aa9c..de0084c 100644 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1429,7 +1429,8 @@ def getpager(): return plainpager if not sys.stdin.isatty() or not sys.stdout.isatty(): return plainpager - if 'PAGER' in os.environ: + 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']) elif os.environ.get('TERM') in ('dumb', 'emacs'): @@ -10,6 +10,9 @@ What's New in Python 3.6.0 alpha 3 Library ------- +- Issue #8637: Honor a pager set by the env var MANPAGER (in preference to + one set by the env var PAGER). + - Issue #22636: Avoid shell injection problems with ctypes.util.find_library(). |