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 4fac7ed43e
)
Co-authored-by: Victor Stinner <vstinner@python.org>
This commit is contained in:
parent
efd878cdb4
commit
ac6f4d2db7
|
@ -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:
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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.
|
Loading…
Reference in New Issue