From: Ka-Ping Yee <ping@zesty.ca>
Date: Sat, 5 Nov 2005 04:49:18 +0000 (+0000)
Subject: Accept patch to resolve SF bug #651124.
X-Git-Tag: v2.5a0~1193
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a487e4eb0599c1a0728ee5c82d515292ccf69456;p=thirdparty%2FPython%2Fcpython.git

Accept patch to resolve SF bug #651124.
---

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 5bc92494a711..8231739f7574 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1299,8 +1299,6 @@ def getpager():
         return plainpager
     if not sys.stdin.isatty() or not sys.stdout.isatty():
         return plainpager
-    if os.environ.get('TERM') in ('dumb', 'emacs'):
-        return plainpager
     if 'PAGER' in os.environ:
         if sys.platform == 'win32': # pipes completely broken in Windows
             return lambda text: tempfilepager(plain(text), os.environ['PAGER'])
@@ -1308,6 +1306,8 @@ def getpager():
             return lambda text: pipepager(plain(text), os.environ['PAGER'])
         else:
             return lambda text: pipepager(text, os.environ['PAGER'])
+    if os.environ.get('TERM') in ('dumb', 'emacs'):
+        return plainpager
     if sys.platform == 'win32' or sys.platform.startswith('os2'):
         return lambda text: tempfilepager(plain(text), 'more <')
     if hasattr(os, 'system') and os.system('(less) 2>/dev/null') == 0: