diff options
Diffstat (limited to 'Lib')
| -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 24d45d2caa..a1abdd6481 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 b70f9440f6..844ed26c3e 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')) |