diff options
| author | Ka-Ping Yee <ping@zesty.ca> | 2005-11-05 04:49:18 (GMT) |
|---|---|---|
| committer | Ka-Ping Yee <ping@zesty.ca> | 2005-11-05 04:49:18 (GMT) |
| commit | a487e4eb0599c1a0728ee5c82d515292ccf69456 (patch) | |
| tree | ecd81f181fca1c812f988feed2c8fdf7932693b5 /Lib | |
| parent | 6d98ed4ad292bab4fc94f0749283912a0c934312 (diff) | |
| download | cpython-a487e4eb0599c1a0728ee5c82d515292ccf69456.zip cpython-a487e4eb0599c1a0728ee5c82d515292ccf69456.tar.gz cpython-a487e4eb0599c1a0728ee5c82d515292ccf69456.tar.bz2 | |
Accept patch to resolve SF bug #651124.
Diffstat (limited to 'Lib')
| -rwxr-xr-x | Lib/pydoc.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 5bc9249..8231739 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: |