Save a call to isfile() and an attempt to build a zipp.Path.

Author: anntzer

importlib_metadata/__init__.py

@@ -24,7 +24,6 @@
     NotADirectoryError,
     PermissionError,
     pathlib,
-    PYPY_OPEN_BUG,
     ModuleNotFoundError,
     MetaPathFinder,
     email_message_from_string,
@@ -418,25 +417,20 @@ def _search_paths(cls, name, paths):
         return itertools.chain.from_iterable(
             cls._search_path(path, name) for path in paths)
 
-    @staticmethod
-    def _switch_path(path):
-        if not PYPY_OPEN_BUG or os.path.isfile(path):  # pragma: no branch
-            with suppress(Exception):
-                return zipp.Path(path)
-        return pathlib.Path(path)
-
     @classmethod
     def _search_path(cls, root, name):
         # This function is microoptimized by avoiding the use of regexes and
         # using strs rather than Path objects.
         root = root or '.'
         try:
             children = os.listdir(root)
+            path_type = pathlib.Path
         except Exception:
             try:
                 with zipfile.ZipFile(root) as zf:
                     children = [os.path.split(child)[0]
                                 for child in zf.namelist()]
+                path_type = zipp.Path
             except Exception:
                 return
         if name is not None:
@@ -456,7 +450,7 @@ def _search_path(cls, root, name):
                     or n_low.startswith(prefix) and n_low.endswith(suffixes)
                     # legacy case:
                     or root_is_egg and n_low == 'egg-info'):
-                yield cls._switch_path(root) / child
+                yield path_type(root, child)
 
 
 class PathDistribution(Distribution):

importlib_metadata/_compat.py

@@ -111,9 +111,6 @@ def py2_message_from_string(text):  # nocoverpy3
     email.message_from_string
     )
 
-# https://bitbucket.org/pypy/pypy/issues/3021/ioopen-directory-leaks-a-file-descriptor
-PYPY_OPEN_BUG = getattr(sys, 'pypy_version_info', (9, 9, 9))[:3] <= (7, 1, 1)
-
 
 class PyPy_repr:
     """