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.
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index 555814e..d217c4d 100644
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -251,6 +251,14 @@
an instance were excluded. (Contributed by Martin Panter in :issue:`25590`.)
+site
+----
+
+When specifying paths to add to :attr:`sys.path` in a `.pth` file,
+you may now specify file paths on top of directories (e.g. zip files).
+(Contributed by Wolfgang Langner in :issue:`26587`).
+
+
telnetlib
---------
diff --git a/Lib/site.py b/Lib/site.py
index 56ba709..b66123f 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -131,13 +131,13 @@
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 @@
"""
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 @@
'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
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 21628a9..f698927 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -75,7 +75,7 @@
def test_init_pathinfo(self):
dir_set = site._init_pathinfo()
for entry in [site.makepath(path)[1] for path in sys.path
- if path and os.path.isdir(path)]:
+ if path and os.path.exists(path)]:
self.assertIn(entry, dir_set,
"%s from sys.path not found in set returned "
"by _init_pathinfo(): %s" % (entry, dir_set))
diff --git a/Misc/ACKS b/Misc/ACKS
index 20e76f5..6dd30f3 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -815,6 +815,7 @@
Tino Lange
Glenn Langford
Andrew Langmead
+Wolfgang Langner
Detlef Lannert
Soren Larsen
Amos Latteier
diff --git a/Misc/NEWS b/Misc/NEWS
index 56b1501..6fbbdb3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -237,6 +237,9 @@
Library
-------
+- Issue #26587: the site module now allows .pth files to specify files to be
+ added to sys.path (e.g. zip files).
+
- Issue #25609: Introduce contextlib.AbstractContextManager and
typing.ContextManager.