diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-02-12 04:32:52 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-12 04:32:52 -0800 |
| commit | ac6f4d2db703c0ff88e496bcb7b7fe55cf2ac458 (patch) | |
| tree | 96534d89da1aefc65872977c4ac4078993b62a22 | |
| parent | efd878cdb46d9c7038d93fb36eb1ff7dc5baf9ec (diff) | |
| download | cpython-git-ac6f4d2db703c0ff88e496bcb7b7fe55cf2ac458.tar.gz | |
bpo-21016: pydoc and trace use sysconfig (GH-18476)
bpo-21016, bpo-1294959: The pydoc and trace modules now use the
sysconfig module to get the path to the Python standard library, to
support uncommon installation path like /usr/lib64/python3.9/ on
Fedora.
Co-Authored-By: Jan Matějek <jmatejek@suse.com>
(cherry picked from commit 4fac7ed43ebf1771a8fe86fdfe7b9991f3be78cd)
Co-authored-by: Victor Stinner <vstinner@python.org>
| -rw-r--r-- | Lib/pydoc.py | 5 | ||||
| -rwxr-xr-x | Lib/trace.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2020-02-12-10-04-39.bpo-21016.bFXPH7.rst | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 9a22e56686..dc3377d68f 100644 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -66,6 +66,7 @@ import pkgutil import platform import re import sys +import sysconfig import time import tokenize import urllib.parse @@ -392,9 +393,7 @@ class Doc: docmodule = docclass = docroutine = docother = docproperty = docdata = fail - def getdocloc(self, object, - basedir=os.path.join(sys.base_exec_prefix, "lib", - "python%d.%d" % sys.version_info[:2])): + def getdocloc(self, object, basedir=sysconfig.get_path('stdlib')): """Return the location of module docs or None""" try: diff --git a/Lib/trace.py b/Lib/trace.py index 62325d3f23..a44735761d 100755 --- a/Lib/trace.py +++ b/Lib/trace.py @@ -52,6 +52,7 @@ __all__ = ['Trace', 'CoverageResults'] import linecache import os import sys +import sysconfig import token import tokenize import inspect @@ -676,9 +677,8 @@ def main(): opts = parser.parse_args() if opts.ignore_dir: - rel_path = 'lib', 'python{0.major}.{0.minor}'.format(sys.version_info) - _prefix = os.path.join(sys.base_prefix, *rel_path) - _exec_prefix = os.path.join(sys.base_exec_prefix, *rel_path) + _prefix = sysconfig.get_path("stdlib") + _exec_prefix = sysconfig.get_path("platstdlib") def parse_ignore_dir(s): s = os.path.expanduser(os.path.expandvars(s)) diff --git a/Misc/NEWS.d/next/Library/2020-02-12-10-04-39.bpo-21016.bFXPH7.rst b/Misc/NEWS.d/next/Library/2020-02-12-10-04-39.bpo-21016.bFXPH7.rst new file mode 100644 index 0000000000..fb91bb3825 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-02-12-10-04-39.bpo-21016.bFXPH7.rst @@ -0,0 +1,4 @@ +The :mod:`pydoc` and :mod:`trace` modules now use the :mod:`sysconfig` +module to get the path to the Python standard library, to support uncommon +installation path like ``/usr/lib64/python3.9/`` on Fedora. +Patch by Jan Matějek. |