diff options
| author | R David Murray <rdmurray@bitdance.com> | 2016-06-03 19:29:18 -0400 |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2016-06-03 19:29:18 -0400 |
| commit | 13ee7d15e3073ca1e602c655ede660a9b1dac01e (patch) | |
| tree | a3aad5ec8c3d063dd438df83b8ba841acfd8929a /Lib/pydoc.py | |
| parent | cb835d875edd3b89100be1befdbe30dc7d59346f (diff) | |
| parent | ead9bfc5c392951d8f0d8c537a138df672b762e4 (diff) | |
| download | cpython-git-13ee7d15e3073ca1e602c655ede660a9b1dac01e.tar.gz | |
Merge: #16484: Fix pydoc doc links to modules whose names are mixed case.
Diffstat (limited to 'Lib/pydoc.py')
| -rw-r--r-- | Lib/pydoc.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 5e5a8aeaa5..85000fe206 100644 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -366,7 +366,7 @@ def safeimport(path, forceload=0, cache={}): class Doc: PYTHONDOCS = os.environ.get("PYTHONDOCS", - "http://docs.python.org/%d.%d/library" + "https://docs.python.org/%d.%d/library" % sys.version_info[:2]) def document(self, object, name=None, *args): @@ -395,7 +395,9 @@ class Doc: docmodule = docclass = docroutine = docother = docproperty = docdata = fail - def getdocloc(self, object): + def getdocloc(self, object, + basedir=os.path.join(sys.base_exec_prefix, "lib", + "python%d.%d" % sys.version_info[:2])): """Return the location of module docs or None""" try: @@ -405,8 +407,6 @@ class Doc: docloc = os.environ.get("PYTHONDOCS", self.PYTHONDOCS) - basedir = os.path.join(sys.base_exec_prefix, "lib", - "python%d.%d" % sys.version_info[:2]) if (isinstance(object, type(os)) and (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', 'marshal', 'posix', 'signal', 'sys', @@ -415,9 +415,9 @@ class Doc: not file.startswith(os.path.join(basedir, 'site-packages')))) and object.__name__ not in ('xml.etree', 'test.pydoc_mod')): if docloc.startswith("http://"): - docloc = "%s/%s" % (docloc.rstrip("/"), object.__name__) + docloc = "%s/%s" % (docloc.rstrip("/"), object.__name__.lower()) else: - docloc = os.path.join(docloc, object.__name__ + ".html") + docloc = os.path.join(docloc, object.__name__.lower() + ".html") else: docloc = None return docloc |