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

miss-islington · web-flow · commit fdb65e399ea4 · 2021-05-21T10:52:24.000-07:00
* [bpo-43643](): Sync with python/importlib_resources@c17a610aad. * Sync with python/importlib_resources@89fd5e961a. (cherry picked from commit 875b3d8) 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
@@ -7,14 +7,15 @@
 import importlib
 
 from typing import Union, Any, Optional
-from .abc import ResourceReader
+from .abc import ResourceReader, Traversable
 
 from ._adapters import wrap_spec
 
 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
@@ -96,6 +96,7 @@ def joinpath(self, child):
     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
@@ -82,6 +82,12 @@ def test_repr(self):
             "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
@@ -0,0 +1 @@
+Declare readers.MultiplexedPath.name as a property per the spec.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Declare readers.MultiplexedPath.name as a property per the spec.`