Revert even more changes

Author: jaraco

Lib/importlib/metadata/__init__.py

@@ -1,12 +1,3 @@
-"""
-APIs exposing metadata from third-party Python packages.
-
-This codebase is shared between importlib.metadata in the stdlib
-and importlib_metadata in PyPI. See
-https://github.com/python/importlib_metadata/wiki/Development-Methodology
-for more detail.
-"""
-
 from __future__ import annotations
 
 import os
@@ -38,7 +29,6 @@
 from itertools import starmap
 from typing import Any, Iterable, List, Mapping, Match, Optional, Set, cast
 
-from ._typing import md_none
 
 __all__ = [
     'Distribution',
@@ -134,14 +124,6 @@ def valid(line: str):
         return line and not line.startswith('#')
 
 
-class _EntryPointMatch(types.SimpleNamespace):
-    module: str
-    attr: str
-    extras: str
-
-
-from typing import Optional, List, cast, Match
-
 class EntryPoint:
     """An entry point as defined by Python packaging conventions.
 
@@ -157,30 +139,6 @@ class EntryPoint:
     'attr'
     >>> ep.extras
     ['extra1', 'extra2']
-
-    If the value package or module are not valid identifiers, a
-    ValueError is raised on access.
-
-    >>> EntryPoint(name=None, group=None, value='invalid-name').module
-    Traceback (most recent call last):
-    ...
-    ValueError: ('Invalid object reference...invalid-name...
-    >>> EntryPoint(name=None, group=None, value='invalid-name').attr
-    Traceback (most recent call last):
-    ...
-    ValueError: ('Invalid object reference...invalid-name...
-    >>> EntryPoint(name=None, group=None, value='invalid-name').extras
-    Traceback (most recent call last):
-    ...
-    ValueError: ('Invalid object reference...invalid-name...
-
-    The same thing happens on construction.
-
-    >>> EntryPoint(name=None, group=None, value='invalid-name')
-    Traceback (most recent call last):
-    ...
-    ValueError: ('Invalid object reference...invalid-name...
-
     """
 
     pattern = re.compile(
@@ -411,17 +369,6 @@ def locate_file(self, path: str | os.PathLike[str]) -> SimplePath:
         """
         Given a path to a file in this distribution, return a SimplePath
         to it.
-
-        This method is used by callers of ``Distribution.files()`` to
-        locate files within the distribution. If it's possible for a
-        Distribution to represent files in the distribution as
-        ``SimplePath`` objects, it should implement this method
-        to resolve such objects.
-
-        Some Distribution providers may elect not to resolve SimplePath
-        objects within the distribution by raising a
-        NotImplementedError, but consumers of such a Distribution would
-        be unable to invoke ``Distribution.files()``.
         """
 
     @classmethod
@@ -500,29 +447,26 @@ def metadata(self) -> _meta.PackageMetadata | None:
         Custom providers may provide the METADATA file or override this
         property.
         """
+        # deferred for performance (python/cpython#109829)
+        from . import _adapters
 
-        text = (
+        opt_text = (
             self.read_text('METADATA')
             or self.read_text('PKG-INFO')
             # This last clause is here to support old egg-info files.  Its
             # effect is to just end up using the PathDistribution's self._path
             # (which points to the egg-info file) attribute unchanged.
             or self.read_text('')
         )
-        return self._assemble_message(text)
-
-    @staticmethod
-    @pass_none
-    def _assemble_message(text: str) -> _meta.PackageMetadata:
-        # deferred for performance (python/cpython#109829)
-        from . import _adapters
-
+        text = cast(str, opt_text)
+        if text is None:
+            return None
         return _adapters.Message(email.message_from_string(text))
 
     @property
     def name(self) -> str:
         """Return the 'Name' metadata for the distribution package."""
-        return md_none(self.metadata)['Name']
+        return self.metadata['Name']
 
     @property
     def _normalized_name(self):
@@ -532,7 +476,7 @@ def _normalized_name(self):
     @property
     def version(self) -> str:
         """Return the 'Version' metadata for the distribution package."""
-        return md_none(self.metadata)['Version']
+        return self.metadata['Version']
 
     @property
     def entry_points(self) -> EntryPoints: