Issue #25985: sys.version_info is now used instead of sys.version
to format short Python version.
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index a73298d..5e5a8ae 100644
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1911,10 +1911,10 @@
def intro(self):
self.output.write('''
-Welcome to Python %s's help utility!
+Welcome to Python {0}'s 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/%s/tutorial/.
+the tutorial on the Internet at http://docs.python.org/{0}/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
@@ -1924,7 +1924,7 @@
"modules", "keywords", "symbols", or "topics". Each module also comes
with a one-line summary of what it does; to list the modules whose name
or summary contain a given string such as "spam", type "modules spam".
-''' % tuple([sys.version[:3]]*2))
+'''.format('%d.%d' % sys.version_info[:2]))
def list(self, items, columns=4, width=80):
items = list(sorted(items))