mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-30 06:34:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Adapt pydoc to new doc URLs.

Browse source
This commit is contained in:
Georg Brandl 2008-01-21 17:13:03 +00:00
parent ae747dccab
commit 0751d1ad2a
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/extending/building.rst
View file

@ -80,7 +80,7 @@ example below. ::
description = 'This is a demo package', description = 'This is a demo package',
author = 'Martin v. Loewis', author = 'Martin v. Loewis',
author_email = 'martin@v.loewis.de', author_email = 'martin@v.loewis.de',
url = 'http://www.python.org/doc/current/ext/building.html', url = 'http://docs.python.org/extending/building',
long_description = ''' long_description = '''
This is really just a demo package. This is really just a demo package.
''', ''',

2
Doc/library/pydoc.rst
View file

@ -59,7 +59,7 @@ documents precisely the version of the module you would get if you started the
Python interpreter and typed ``import spam``. Python interpreter and typed ``import spam``.
Module docs for core modules are assumed to reside in Module docs for core modules are assumed to reside in
http://www.python.org/doc/current/lib/. This can be overridden by setting the http://docs.python.org/library/. This can be overridden by setting the
:envvar:`PYTHONDOCS` environment variable to a different URL or to a local :envvar:`PYTHONDOCS` environment variable to a different URL or to a local
directory containing the Library Reference Manual pages. directory containing the Library Reference Manual pages.

13
Lib/pydoc.py
View file

@ -27,7 +27,7 @@ to a file named "<name>.html".
Module docs for core modules are assumed to be in Module docs for core modules are assumed to be in
http://www.python.org/doc/current/lib/ http://docs.python.org/library/
This can be overridden by setting the PYTHONDOCS environment variable This can be overridden by setting the PYTHONDOCS environment variable
to a different URL or to a local directory containing the Library to a different URL or to a local directory containing the Library
@ -346,7 +346,7 @@ class Doc:
file = '(built-in)' file = '(built-in)'
docloc = os.environ.get("PYTHONDOCS", docloc = os.environ.get("PYTHONDOCS",
"http://www.python.org/doc/current/lib") "http://docs.python.org/library")
basedir = os.path.join(sys.exec_prefix, "lib", basedir = os.path.join(sys.exec_prefix, "lib",
"python"+sys.version[0:3]) "python"+sys.version[0:3])
if (isinstance(object, type(os)) and if (isinstance(object, type(os)) and
@ -355,11 +355,10 @@ class Doc:
'thread', 'zipimport') or 'thread', 'zipimport') or
(file.startswith(basedir) and (file.startswith(basedir) and
not file.startswith(os.path.join(basedir, 'site-packages'))))): not file.startswith(os.path.join(basedir, 'site-packages'))))):
htmlfile = "module-%s.html" % object.__name__
if docloc.startswith("http://"): if docloc.startswith("http://"):
docloc = "%s/%s" % (docloc.rstrip("/"), htmlfile) docloc = "%s/%s" % (docloc.rstrip("/"), object.__name__)
else: else:
docloc = os.path.join(docloc, htmlfile) docloc = os.path.join(docloc, object.__name__ + ".html")
else: else:
docloc = None docloc = None
return docloc return docloc
@ -541,7 +540,7 @@ class HTMLDoc(Doc):
url = 'http://www.rfc-editor.org/rfc/rfc%d.txt' % int(rfc) url = 'http://www.rfc-editor.org/rfc/rfc%d.txt' % int(rfc)
results.append('<a href="%s">%s</a>' % (url, escape(all))) results.append('<a href="%s">%s</a>' % (url, escape(all)))
elif pep: elif pep:
url = 'http://www.python.org/peps/pep-%04d.html' % int(pep) url = 'http://www.python.org/peps/pep-%04d' % int(pep)
results.append('<a href="%s">%s</a>' % (url, escape(all))) results.append('<a href="%s">%s</a>' % (url, escape(all)))
elif text[end:end+1] == '(': elif text[end:end+1] == '(':
results.append(self.namelink(name, methods, funcs, classes)) results.append(self.namelink(name, methods, funcs, classes))
@ -1710,7 +1709,7 @@ has the same effect as typing a particular string at the help> prompt.
Welcome to Python %s! This is the online help utility. Welcome to Python %s! This is the online help utility.
If this is your first time using Python, you should definitely check out If this is your first time using Python, you should definitely check out
the tutorial on the Internet at http://www.python.org/doc/tut/. the tutorial on the Internet at http://docs.python.org/tutorial/.
Enter the name of any module, keyword, or topic to get help on writing 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 Python programs and using Python modules. To quit this help utility and