traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #16484: Merge pydoc Windows fixes from 3.5

This commit is contained in:
Martin Panter 2016-06-12 04:31:25 +00:00
parent 62bdea58c5 4f8aaf6440
commit 5285545271
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/pydoc.py
View File

@ -28,7 +28,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://docs.python.org/X.Y/library/ https://docs.python.org/X.Y/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
@ -407,6 +407,7 @@ class Doc:
docloc = os.environ.get("PYTHONDOCS", self.PYTHONDOCS) docloc = os.environ.get("PYTHONDOCS", self.PYTHONDOCS)
basedir = os.path.normcase(basedir)
if (isinstance(object, type(os)) and if (isinstance(object, type(os)) and
(object.__name__ in ('errno', 'exceptions', 'gc', 'imp', (object.__name__ in ('errno', 'exceptions', 'gc', 'imp',
'marshal', 'posix', 'signal', 'sys', 'marshal', 'posix', 'signal', 'sys',
@ -414,7 +415,7 @@ class Doc:
(file.startswith(basedir) and (file.startswith(basedir) and
not file.startswith(os.path.join(basedir, 'site-packages')))) and not file.startswith(os.path.join(basedir, 'site-packages')))) and
object.__name__ not in ('xml.etree', 'test.pydoc_mod')): object.__name__ not in ('xml.etree', 'test.pydoc_mod')):
if docloc.startswith("http://"): if docloc.startswith(("http://", "https://")):
docloc = "%s/%s" % (docloc.rstrip("/"), object.__name__.lower()) docloc = "%s/%s" % (docloc.rstrip("/"), object.__name__.lower())
else: else:
docloc = os.path.join(docloc, object.__name__.lower() + ".html") docloc = os.path.join(docloc, object.__name__.lower() + ".html")

2
Lib/test/test_pydoc.py
View File

@ -356,7 +356,7 @@ def get_pydoc_html(module):
def get_pydoc_link(module): def get_pydoc_link(module):
"Returns a documentation web link of a module" "Returns a documentation web link of a module"
dirname = os.path.dirname dirname = os.path.dirname
basedir = os.path.join(dirname(dirname(__file__))) basedir = dirname(dirname(__file__))
doc = pydoc.TextDoc() doc = pydoc.TextDoc()
loc = doc.getdocloc(module, basedir=basedir) loc = doc.getdocloc(module, basedir=basedir)
return loc return loc

4
Misc/NEWS
View File

@ -225,6 +225,10 @@ IDLE
Documentation Documentation
------------- -------------
- Issue #16484: Change the default PYTHONDOCS URL to "https:", and fix the
resulting links to use lowercase. Patch by Sean Rodman, test by Kaushik
Nadikuditi.
- Issue #24136: Document the new PEP 448 unpacking syntax of 3.5. - Issue #24136: Document the new PEP 448 unpacking syntax of 3.5.
- Issue #22558: Add remaining doc links to source code for Python-coded modules. - Issue #22558: Add remaining doc links to source code for Python-coded modules.