diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2014-11-27 22:11:07 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-11-27 22:11:07 (GMT) |
commit | f1fc9fb33d6e3181fde24d9fc1a5a224fda5c2ef (patch) | |
tree | 71fee2a34219d0c2d75b6b285978fb19db1bda8d | |
parent | 5916d5303273c9b7f8918b0776ea0f7467e7cebd (diff) | |
parent | ab5e9b9213558d00ef8405d89e4cb103795972e3 (diff) | |
download | cpython-f1fc9fb33d6e3181fde24d9fc1a5a224fda5c2ef.zip cpython-f1fc9fb33d6e3181fde24d9fc1a5a224fda5c2ef.tar.gz cpython-f1fc9fb33d6e3181fde24d9fc1a5a224fda5c2ef.tar.bz2 |
Issue #22314: pydoc now works when the LINES environment variable is set.
-rwxr-xr-x | Lib/pydoc.py | 10 | ||||
-rw-r--r-- | Misc/NEWS | 5 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 11451e8..60b0a9e5 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1477,12 +1477,18 @@ def ttypager(text): old = tty.tcgetattr(fd) tty.setcbreak(fd) getchar = lambda: sys.stdin.read(1) - except (ImportError, AttributeError): + except (ImportError, AttributeError, io.UnsupportedOperation): tty = None getchar = lambda: sys.stdin.readline()[:-1][:1] try: - r = inc = os.environ.get('LINES', 25) - 1 + try: + h = int(os.environ.get('LINES', 0)) + except ValueError: + h = 0 + if h <= 1: + h = 25 + r = inc = h - 1 sys.stdout.write('\n'.join(lines[:inc]) + '\n') while lines[r:]: sys.stdout.write('-- more --') @@ -383,6 +383,11 @@ Library - Issue #17442: InteractiveInterpreter now displays the full chained traceback in its showtraceback method, to match the built in interactive interpreter. +Tools/Demos +----------- + +- Issue #22314: pydoc now works when the LINES environment variable is set. + - Issue #10510: distutils register and upload methods now use HTML standards compliant CRLF line endings. |