mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
Issue #26587: Allow .pth files to specify file paths as well as
directories. Thanks to Wolfgang Langner for the bug report and initial version of the patch.
This commit is contained in:
parent
ef0138f421
commit
5f0507d8ab
5 changed files with 22 additions and 10 deletions
18
Lib/site.py
18
Lib/site.py
|
@ -131,13 +131,13 @@ def removeduppaths():
|
|||
|
||||
|
||||
def _init_pathinfo():
|
||||
"""Return a set containing all existing directory entries from sys.path"""
|
||||
"""Return a set containing all existing file system items from sys.path."""
|
||||
d = set()
|
||||
for dir in sys.path:
|
||||
for item in sys.path:
|
||||
try:
|
||||
if os.path.isdir(dir):
|
||||
dir, dircase = makepath(dir)
|
||||
d.add(dircase)
|
||||
if os.path.exists(item):
|
||||
_, itemcase = makepath(item)
|
||||
d.add(itemcase)
|
||||
except TypeError:
|
||||
continue
|
||||
return d
|
||||
|
@ -150,9 +150,9 @@ def addpackage(sitedir, name, known_paths):
|
|||
"""
|
||||
if known_paths is None:
|
||||
known_paths = _init_pathinfo()
|
||||
reset = 1
|
||||
reset = True
|
||||
else:
|
||||
reset = 0
|
||||
reset = False
|
||||
fullname = os.path.join(sitedir, name)
|
||||
try:
|
||||
f = open(fullname, "r")
|
||||
|
@ -190,9 +190,9 @@ def addsitedir(sitedir, known_paths=None):
|
|||
'sitedir'"""
|
||||
if known_paths is None:
|
||||
known_paths = _init_pathinfo()
|
||||
reset = 1
|
||||
reset = True
|
||||
else:
|
||||
reset = 0
|
||||
reset = False
|
||||
sitedir, sitedircase = makepath(sitedir)
|
||||
if not sitedircase in known_paths:
|
||||
sys.path.append(sitedir) # Add path component
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue