diff options
author | Georg Brandl <georg@python.org> | 2010-08-01 19:09:07 +0000 |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2010-08-01 19:09:07 +0000 |
commit | e5d518f2526ab1008232767080b867cdb1eb052d (patch) | |
tree | f1995e83ea181e97f099ea158b752186a02f62e7 /Lib/pydoc.py | |
parent | caa78fee030f5a832141570ff2b56367059a3ce9 (diff) | |
download | cpython-git-e5d518f2526ab1008232767080b867cdb1eb052d.tar.gz |
Merged revisions 83370,83372-83374,83384 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r83370 | georg.brandl | 2010-07-31 23:51:48 +0200 (Sa, 31 Jul 2010) | 5 lines
#8198: the Helper class should not save the stdin and stdout objects
at import time, rather by default use the current streams like the
other APIs that output help.
........
r83372 | georg.brandl | 2010-08-01 00:05:54 +0200 (So, 01 Aug 2010) | 1 line
#4007: remove *.a and *.so.X.Y files in "make clean".
........
r83373 | georg.brandl | 2010-08-01 00:11:11 +0200 (So, 01 Aug 2010) | 1 line
#5147: revert accidental indentation of header constant for MozillaCookieJar.
........
r83374 | georg.brandl | 2010-08-01 00:32:52 +0200 (So, 01 Aug 2010) | 1 line
#5146: handle UID THREAD command correctly.
........
r83384 | georg.brandl | 2010-08-01 08:32:55 +0200 (So, 01 Aug 2010) | 1 line
Build properties using lambdas. This makes test_pyclbr pass again, because it does not think that input and output are methods anymore.
........
Diffstat (limited to 'Lib/pydoc.py')
-rwxr-xr-x | Lib/pydoc.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 3f2a5d85c9..e1e6d80685 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1694,9 +1694,12 @@ class Helper: 'CONTEXTMANAGERS': ('context-managers', 'with'), } - def __init__(self, input, output): - self.input = input - self.output = output + def __init__(self, input=None, output=None): + self._input = input + self._output = output + + input = property(lambda self: self._input or sys.stdin) + output = property(lambda self: self._output or sys.stdout) def __repr__(self): if inspect.stack()[1][3] == '?': @@ -1872,7 +1875,7 @@ Enter any module name to get more help. Or, type "modules spam" to search for modules whose descriptions contain the word "spam". ''') -help = Helper(sys.stdin, sys.stdout) +help = Helper() class Scanner: """A generic tree iterator.""" |