From: doko@ubuntu.com <doko@ubuntu.com>
Date: Tue, 14 Jun 2016 07:03:52 +0000 (+0200)
Subject: - Issue #8637: Honor a pager set by the env var MANPAGER (in preference to
X-Git-Tag: v3.6.0a3~158
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c8fd1928d0e435d10d3743773ea8707f6beecede;p=thirdparty%2FPython%2Fcpython.git

- 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 de0084c3e54c..d7a177f1a218 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':