mirror of
https://github.com/python/cpython.git
synced 2025-08-26 19:55:24 +00:00
Merged revisions 60151-60159,60161-60168,60170,60172-60173,60175 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r60151 | christian.heimes | 2008-01-21 14:11:15 +0100 (Mon, 21 Jan 2008) | 1 line A bunch of header files were not listed as dependencies for object files. Changes to files like Parser/parser.h weren't picked up by make. ........ r60152 | georg.brandl | 2008-01-21 15:16:46 +0100 (Mon, 21 Jan 2008) | 3 lines #1087741: make mmap.mmap the type of mmap objects, not a factory function. Allow it to be subclassed. ........ r60153 | georg.brandl | 2008-01-21 15:18:14 +0100 (Mon, 21 Jan 2008) | 2 lines mmap is an extension module. ........ r60154 | georg.brandl | 2008-01-21 17:28:13 +0100 (Mon, 21 Jan 2008) | 2 lines Fix example. ........ r60155 | georg.brandl | 2008-01-21 17:34:07 +0100 (Mon, 21 Jan 2008) | 2 lines #1555501: document plistlib and move it to the general library. ........ r60156 | georg.brandl | 2008-01-21 17:36:00 +0100 (Mon, 21 Jan 2008) | 2 lines Add a stub for bundlebuilder documentation. ........ r60157 | georg.brandl | 2008-01-21 17:46:58 +0100 (Mon, 21 Jan 2008) | 2 lines Removing bundlebuilder docs again -- it's not to be used anymore (see #779825). ........ r60158 | georg.brandl | 2008-01-21 17:51:51 +0100 (Mon, 21 Jan 2008) | 2 lines #997912: acknowledge nested scopes in tutorial. ........ r60159 | vinay.sajip | 2008-01-21 18:02:26 +0100 (Mon, 21 Jan 2008) | 1 line Fix: #1836: Off-by-one bug in TimedRotatingFileHandler rollover calculation. Patch thanks to Kathryn M. Kowalski. ........ r60161 | georg.brandl | 2008-01-21 18:13:03 +0100 (Mon, 21 Jan 2008) | 2 lines Adapt pydoc to new doc URLs. ........ r60162 | georg.brandl | 2008-01-21 18:17:00 +0100 (Mon, 21 Jan 2008) | 2 lines Fix old link. ........ r60163 | georg.brandl | 2008-01-21 18:22:06 +0100 (Mon, 21 Jan 2008) | 2 lines #1726198: replace while 1: fp.readline() with file iteration. ........ r60164 | georg.brandl | 2008-01-21 18:29:23 +0100 (Mon, 21 Jan 2008) | 2 lines Clarify $ behavior in re docstring. #1631394. ........ r60165 | vinay.sajip | 2008-01-21 18:39:22 +0100 (Mon, 21 Jan 2008) | 1 line Minor documentation change - hyperlink tidied up. ........ r60166 | georg.brandl | 2008-01-21 18:42:40 +0100 (Mon, 21 Jan 2008) | 2 lines #1530959: change distutils build dir for --with-pydebug python builds. ........ r60167 | vinay.sajip | 2008-01-21 19:16:05 +0100 (Mon, 21 Jan 2008) | 1 line Updated to include news on recent logging fixes and documentation changes. ........ r60168 | georg.brandl | 2008-01-21 19:35:49 +0100 (Mon, 21 Jan 2008) | 3 lines Issue #1882: when compiling code from a string, encoding cookies in the second line of code were not always recognized correctly. ........ r60170 | georg.brandl | 2008-01-21 19:36:51 +0100 (Mon, 21 Jan 2008) | 2 lines Add NEWS entry for #1882. ........ r60172 | georg.brandl | 2008-01-21 19:41:24 +0100 (Mon, 21 Jan 2008) | 2 lines Use original location of document, which has translations. ........ r60173 | walter.doerwald | 2008-01-21 21:18:04 +0100 (Mon, 21 Jan 2008) | 2 lines Follow PEP 8 in module docstring. ........ r60175 | georg.brandl | 2008-01-21 21:20:53 +0100 (Mon, 21 Jan 2008) | 2 lines Adapt to latest doctools refactoring. ........
This commit is contained in:
Georg Brandl
parent
e1c981161c
commit
86def6cb2b
25 changed files with 382 additions and 133 deletions
13
Lib/pydoc.py
13
Lib/pydoc.py
|
|
@ -27,7 +27,7 @@ to a file named "<name>.html".
|
|||
|
||||
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
|
||||
to a different URL or to a local directory containing the Library
|
||||
|
|
@ -341,7 +341,7 @@ class Doc:
|
|||
file = '(built-in)'
|
||||
|
||||
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",
|
||||
"python"+sys.version[0:3])
|
||||
if (isinstance(object, type(os)) and
|
||||
|
|
@ -350,11 +350,10 @@ class Doc:
|
|||
'thread', 'zipimport') or
|
||||
(file.startswith(basedir) and
|
||||
not file.startswith(os.path.join(basedir, 'site-packages'))))):
|
||||
htmlfile = "module-%s.html" % object.__name__
|
||||
if docloc.startswith("http://"):
|
||||
docloc = "%s/%s" % (docloc.rstrip("/"), htmlfile)
|
||||
docloc = "%s/%s" % (docloc.rstrip("/"), object.__name__)
|
||||
else:
|
||||
docloc = os.path.join(docloc, htmlfile)
|
||||
docloc = os.path.join(docloc, object.__name__ + ".html")
|
||||
else:
|
||||
docloc = None
|
||||
return docloc
|
||||
|
|
@ -537,7 +536,7 @@ class HTMLDoc(Doc):
|
|||
url = 'http://www.rfc-editor.org/rfc/rfc%d.txt' % int(rfc)
|
||||
results.append('<a href="%s">%s</a>' % (url, escape(all)))
|
||||
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)))
|
||||
elif text[end:end+1] == '(':
|
||||
results.append(self.namelink(name, methods, funcs, classes))
|
||||
|
|
@ -1729,7 +1728,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://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
|
||||
Python programs and using Python modules. To quit this help utility and
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue