[Python-checkins] commit of r41399 - python/trunk/Lib

[ka-ping.yee@python.org]

Author: ka-ping.yee
Date: Sat Nov  5 05:49:18 2005
New Revision: 41399

Modified:
   python/trunk/Lib/pydoc.py
Log:
Accept patch to resolve SF bug #651124.


Modified: python/trunk/Lib/pydoc.py
==============================================================================
--- python/trunk/Lib/pydoc.py	(original)
+++ python/trunk/Lib/pydoc.py	Sat Nov  5 05:49:18 2005
@@ -1299,8 +1299,6 @@
         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 @@
             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: