diff options
| author | Anthony Sottile <asottile@umich.edu> | 2019-05-30 00:13:12 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2019-05-30 00:13:11 (GMT) |
| commit | 80878312316bfb4011157f13cf040f6d885f808b (patch) | |
| tree | 6d3b9bda59377738f9b418c96e65ce990f6a9aa2 | |
| parent | 29cb21ddb92413931e473eb799a02e2d8cdf4a45 (diff) | |
| download | cpython-80878312316bfb4011157f13cf040f6d885f808b.zip cpython-80878312316bfb4011157f13cf040f6d885f808b.tar.gz cpython-80878312316bfb4011157f13cf040f6d885f808b.tar.bz2 | |
Don't crash if there exists an EGG-INFO directory on sys.path (#13667)
* 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
| -rw-r--r-- | Lib/importlib/metadata/__init__.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_importlib/test_main.py | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py index 24d45d2..a1abdd6 100644 --- a/Lib/importlib/metadata/__init__.py +++ b/Lib/importlib/metadata/__init__.py @@ -320,7 +320,8 @@ class PathDistribution(Distribution): self._path = path 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') read_text.__doc__ = Distribution.read_text.__doc__ diff --git a/Lib/test/test_importlib/test_main.py b/Lib/test/test_importlib/test_main.py index b70f944..844ed26 100644 --- a/Lib/test/test_importlib/test_main.py +++ b/Lib/test/test_importlib/test_main.py @@ -156,3 +156,11 @@ class DiscoveryTests(fixtures.EggInfoPkg, dist.metadata['Name'] == 'distinfo-pkg' 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')) |