(original) (raw)

changeset: 76016:ee9b6574b497 parent: 76014:a51764ed57a2 parent: 76015:d478c0a68bcb user: R David Murray rdmurray@bitdance.com date: Sat Mar 31 12:08:59 2012 -0400 files: Lib/pydoc.py description: 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. diff -r a51764ed57a2 -r ee9b6574b497 Lib/pydoc.py --- a/Lib/pydoc.py Sat Mar 31 17:44:33 2012 +0200 +++ b/Lib/pydoc.py Sat Mar 31 12:08:59 2012 -0400 @@ -1826,7 +1826,7 @@ 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 @@ "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)) /rdmurray@bitdance.com