[3.10] bpo-43643: Sync with python/importlib_resources@c17a610aad. (GH-26284) (GH...

* [bpo-43643](): Sync with python/importlib_resources@c17a610aad.
* Sync with python/importlib_resources@89fd5e961a.
(cherry picked from commit 875b3d84b3072b2d3c352ad9f0ff52c441fbd12e)

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
Automerge-Triggered-By: GH:jaraco

diff --git a/Lib/importlib/_common.py b/Lib/importlib/_common.py
index 03383048ad7365e43ad7df0d92cc651a3a5ad286..ed509971ce718f4dd108ee436b04ae204836ea21 100644 (file)
--- a/Lib/importlib/_common.py
+++ b/Lib/importlib/_common.py
@@ -7,7 +7,7 @@ import types
 import importlib
 
 from typing import Union, Any, Optional
-from .abc import ResourceReader
+from .abc import ResourceReader, Traversable
 
 from ._adapters import wrap_spec
 
@@ -15,6 +15,7 @@ Package = Union[types.ModuleType, str]
 
 
 def files(package):
+    # type: (Package) -> Traversable
     """
     Get a Traversable resource from a package
     """

diff --git a/Lib/importlib/readers.py b/Lib/importlib/readers.py
index 535c8283e9081dfb33e8892e364d2a8356ad3daa..3e91c1cae6758b68fece6a0c6a724cc1b2d37a30 100644 (file)
--- a/Lib/importlib/readers.py
+++ b/Lib/importlib/readers.py
@@ -96,6 +96,7 @@ class MultiplexedPath(abc.Traversable):
     def open(self, *args, **kwargs):
         raise FileNotFoundError('{} is not a file'.format(self))
 
+    @property
     def name(self):
         return self._paths[0].name
 

diff --git a/Lib/test/test_importlib/test_reader.py b/Lib/test/test_importlib/test_reader.py
index b0bf49b8ba7f2866076d9ba21ce2fef01abb6e59..ed1f6be717b7e32cd6cd7575eaf7ab2e17fd6cdd 100644 (file)
--- a/Lib/test/test_importlib/test_reader.py
+++ b/Lib/test/test_importlib/test_reader.py
@@ -82,6 +82,12 @@ class MultiplexedPathTest(unittest.TestCase):
             "MultiplexedPath('{}')".format(self.folder),
         )
 
+    def test_name(self):
+        self.assertEqual(
+            MultiplexedPath(self.folder).name,
+            os.path.basename(self.folder),
+        )
+
 
 class NamespaceReaderTest(unittest.TestCase):
     site_dir = str(pathlib.Path(__file__).parent)

diff --git a/Misc/NEWS.d/next/Library/2021-05-21-12-12-35.bpo-43643.GWnmcF.rst b/Misc/NEWS.d/next/Library/2021-05-21-12-12-35.bpo-43643.GWnmcF.rst
new file mode 100644 (file)
index 0000000..57157df
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-05-21-12-12-35.bpo-43643.GWnmcF.rst
@@ -0,0 +1 @@
+Declare readers.MultiplexedPath.name as a property per the spec.