diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-04-01 22:48:11 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-04-01 22:48:11 (GMT) |
| commit | 29f843816bb6016ac673a3e0e4b3996fd235a152 (patch) | |
| tree | fcd4316b1ab918c4bb37a4736f86f85f764f6a74 /Lib/pydoc.py | |
| parent | ab3c1c1994ec819781ba27ba8a5c6d75f70cb2af (diff) | |
| parent | 709176f10c1774f608a318171a94371e7d05d98f (diff) | |
| download | cpython-29f843816bb6016ac673a3e0e4b3996fd235a152.zip cpython-29f843816bb6016ac673a3e0e4b3996fd235a152.tar.gz cpython-29f843816bb6016ac673a3e0e4b3996fd235a152.tar.bz2 | |
merge heads
Diffstat (limited to 'Lib/pydoc.py')
| -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 f45d461..89fd09b 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1829,7 +1829,7 @@ has the same effect as typing a particular string at the help> prompt. Welcome to Python %s! This is the online help utility. If this is your first time using Python, you should definitely check out -the tutorial on the Internet at http://docs.python.org/tutorial/. +the tutorial on the Internet at http://docs.python.org/%s/tutorial/. Enter the name of any module, keyword, or topic to get help on writing Python programs and using Python modules. To quit this help utility and @@ -1839,7 +1839,7 @@ To get a list of available modules, keywords, or topics, type "modules", "keywords", or "topics". Each module also comes with a one-line summary of what it does; to list the modules whose summaries contain a given word such as "spam", type "modules spam". -''' % sys.version[:3]) +''' % tuple([sys.version[:3]]*2)) def list(self, items, columns=4, width=80): items = list(sorted(items)) |