summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2012-03-31 16:08:59 (GMT)
committerR David Murray <rdmurray@bitdance.com>2012-03-31 16:08:59 (GMT)
commit8613b0dea4b5150539853e32afd5b5c53be07e5e (patch)
treef648b0c8d65f929c6661390f138db84c66ef0697
parentdc60f940b5081e1303139099efe426beb05e5230 (diff)
parentde0f6297a703918d12a2f2c48bc44fcbc7946a13 (diff)
downloadcpython-8613b0dea4b5150539853e32afd5b5c53be07e5e.zip
cpython-8613b0dea4b5150539853e32afd5b5c53be07e5e.tar.gz
cpython-8613b0dea4b5150539853e32afd5b5c53be07e5e.tar.bz2
Merge #14434: make tutorial link in 'help' banner version-specific
Without this fix, both 2.7 and 3.x would always point to the "current" docs...which means that before this fix python 3.2 'help' pointed to the 2.7 tutorial.
-rwxr-xr-xLib/pydoc.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 591717b..cc22d73 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1826,7 +1826,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
@@ -1836,7 +1836,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))