mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-22 22:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Don't crash if there exists an EGG-INFO directory on sys.path (#13667)

Browse source 
* Don't crash if there exists an EGG-INFO directory on sys.path

cross-port of https://gitlab.com/python-devs/importlib_metadata/merge_requests/72

* Also catch PermissionError for windows
This commit is contained in:
Anthony Sottile 2019-05-29 17:13:12 -07:00 • committed by Barry Warsaw
parent 29cb21ddb9
commit 8087831231
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/importlib/metadata/__init__.py
View file

@ -320,7 +320,8 @@ class PathDistribution(Distribution):
self._path = path self._path = path
def read_text(self, filename): def read_text(self, filename):
with suppress(FileNotFoundError, NotADirectoryError, KeyError): with suppress(FileNotFoundError, IsADirectoryError, KeyError,
NotADirectoryError, PermissionError):
return self._path.joinpath(filename).read_text(encoding='utf-8') return self._path.joinpath(filename).read_text(encoding='utf-8')
read_text.__doc__ = Distribution.read_text.__doc__ read_text.__doc__ = Distribution.read_text.__doc__

8
Lib/test/test_importlib/test_main.py
View file

@ -156,3 +156,11 @@ class DiscoveryTests(fixtures.EggInfoPkg,
dist.metadata['Name'] == 'distinfo-pkg' dist.metadata['Name'] == 'distinfo-pkg'
for dist in dists for dist in dists
) )
class DirectoryTest(fixtures.OnSysPath, fixtures.SiteDir, unittest.TestCase):
def test(self):
# make an `EGG-INFO` directory that's unrelated
self.site_dir.joinpath('EGG-INFO').mkdir()
# used to crash with `IsADirectoryError`
self.assertIsNone(version('unknown-package'))