diff options
| author | Anthony Sottile <asottile@umich.edu> | 2019-05-29 17:13:12 -0700 |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2019-05-29 17:13:11 -0700 |
| commit | 80878312316bfb4011157f13cf040f6d885f808b (patch) | |
| tree | 6d3b9bda59377738f9b418c96e65ce990f6a9aa2 /Lib/importlib | |
| parent | 29cb21ddb92413931e473eb799a02e2d8cdf4a45 (diff) | |
| download | cpython-git-80878312316bfb4011157f13cf040f6d885f808b.tar.gz | |
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
Diffstat (limited to 'Lib/importlib')
| -rw-r--r-- | Lib/importlib/metadata/__init__.py | 3 |
1 files changed, 2 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__ |