- Issue #8637: Honor a pager set by the env var MANPAGER (in preference to

  one set by the env var PAGER).

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 063aa9cf076f6622b514a1899b78faff6736a338..de0084c3e54cc51f4568d892d8e0f11fdb0b41b6 100644 (file)
--- 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'):

diff --git a/Misc/NEWS b/Misc/NEWS
index 246896fa909e4e113d3b1ac81bf57695c974da94..956303a3a1821c70db28ba34d71255820e2f2cb9 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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().