bpo-44771: "Revert apply changes from importlib_resources 5.2.1"

.gitattributes

@@ -28,7 +28,6 @@ Lib/test/test_email/data/*.txt -text
 Lib/test/xmltestdata/* -text
 Lib/test/coding20731.py -text
 Lib/test/test_importlib/data01/* -text
-Lib/test/test_importlib/namespacedata01/* -text
 
 # CRLF files
 *.bat text eol=crlf

Lib/importlib/_adapters.py

@@ -1,5 +1,4 @@
 from contextlib import suppress
-from io import TextIOWrapper
 
 from . import abc
 
@@ -26,119 +25,32 @@ def __init__(self, spec):
         self.spec = spec
 
     def get_resource_reader(self, name):
-        return CompatibilityFiles(self.spec)._native()
+        return DegenerateFiles(self.spec)._native()
 
 
-def _io_wrapper(file, mode='r', *args, **kwargs):
-    if mode == 'r':
-        return TextIOWrapper(file, *args, **kwargs)
-    elif mode == 'rb':
-        return file
-    raise ValueError(
-        "Invalid mode value '{}', only 'r' and 'rb' are supported".format(mode)
-    )
-
-
-class CompatibilityFiles:
+class DegenerateFiles:
     """
     Adapter for an existing or non-existant resource reader
-    to provide a compability .files().
+    to provide a degenerate .files().
     """
 
-    class SpecPath(abc.Traversable):
-        """
-        Path tied to a module spec.
-        Can be read and exposes the resource reader children.
-        """
-
-        def __init__(self, spec, reader):
-            self._spec = spec
-            self._reader = reader
-
-        def iterdir(self):
-            if not self._reader:
-                return iter(())
-            return iter(
-                CompatibilityFiles.ChildPath(self._reader, path)
-                for path in self._reader.contents()
-            )
-
-        def is_file(self):
-            return False
-
-        is_dir = is_file
-
-        def joinpath(self, other):
-            if not self._reader:
-                return CompatibilityFiles.OrphanPath(other)
-            return CompatibilityFiles.ChildPath(self._reader, other)
-
-        @property
-        def name(self):
-            return self._spec.name
-
-        def open(self, mode='r', *args, **kwargs):
-            return _io_wrapper(self._reader.open_resource(None), mode, *args, **kwargs)
-
-    class ChildPath(abc.Traversable):
-        """
-        Path tied to a resource reader child.
-        Can be read but doesn't expose any meaningfull children.
-        """
-
-        def __init__(self, reader, name):
-            self._reader = reader
-            self._name = name
-
+    class Path(abc.Traversable):
         def iterdir(self):
             return iter(())
 
-        def is_file(self):
-            return self._reader.is_resource(self.name)
-
         def is_dir(self):
-            return not self.is_file()
-
-        def joinpath(self, other):
-            return CompatibilityFiles.OrphanPath(self.name, other)
-
-        @property
-        def name(self):
-            return self._name
-
-        def open(self, mode='r', *args, **kwargs):
-            return _io_wrapper(
-                self._reader.open_resource(self.name), mode, *args, **kwargs
-            )
-
-    class OrphanPath(abc.Traversable):
-        """
-        Orphan path, not tied to a module spec or resource reader.
-        Can't be read and doesn't expose any meaningful children.
-        """
-
-        def __init__(self, *path_parts):
-            if len(path_parts) < 1:
-                raise ValueError('Need at least one path part to construct a path')
-            self._path = path_parts
-
-        def iterdir(self):
-            return iter(())
-
-        def is_file(self):
             return False
 
-        is_dir = is_file
+        is_file = exists = is_dir  # type: ignore
 
         def joinpath(self, other):
-            return CompatibilityFiles.OrphanPath(*self._path, other)
+            return DegenerateFiles.Path()
 
-        @property
         def name(self):
-            return self._path[-1]
+            return ''
 
-        def open(self, mode='r', *args, **kwargs):
-            raise FileNotFoundError("Can't open orphan path")
+        def open(self):
+            raise ValueError()
 
     def __init__(self, spec):
         self.spec = spec
@@ -159,7 +71,7 @@ def __getattr__(self, attr):
         return getattr(self._reader, attr)
 
     def files(self):
-        return CompatibilityFiles.SpecPath(self.spec, self._reader)
+        return DegenerateFiles.Path()
 
 
 def wrap_spec(package):

Lib/importlib/_common.py

@@ -12,7 +12,6 @@
 from ._adapters import wrap_spec
 
 Package = Union[types.ModuleType, str]
-Resource = Union[str, os.PathLike]
 
 
 def files(package):
@@ -94,7 +93,7 @@ def _tempfile(reader, suffix=''):
     finally:
         try:
             os.remove(raw_path)
-        except (FileNotFoundError, PermissionError):
+        except FileNotFoundError:
             pass
 
 

Lib/importlib/readers.py

@@ -1,12 +1,8 @@
 import collections
-import operator
-import pathlib
 import zipfile
-
+import pathlib
 from . import abc
 
-from ._itertools import unique_everseen
-
 
 def remove_duplicates(items):
     return iter(collections.OrderedDict.fromkeys(items))
@@ -67,8 +63,13 @@ def __init__(self, *paths):
             raise NotADirectoryError('MultiplexedPath only supports directories')
 
     def iterdir(self):
-        files = (file for path in self._paths for file in path.iterdir())
-        return unique_everseen(files, key=operator.attrgetter('name'))
+        visited = []
+        for path in self._paths:
+            for file in path.iterdir():
+                if file.name in visited:
+                    continue
+                visited.append(file.name)
+                yield file
 
     def read_bytes(self):
         raise FileNotFoundError(f'{self} is not a file')