Refactored parsing and handling of EntryPoint.value.

Author: jaraco

importlib_metadata/__init__.py

@@ -26,7 +26,7 @@
 from importlib import import_module
 from importlib.abc import MetaPathFinder
 from itertools import starmap
-from typing import Any, Iterable, List, Mapping, Match, Optional, Set, cast
+from typing import Any, Iterable, List, Mapping, Optional, Set, cast
 
 from . import _meta
 from ._collections import FreezableDefaultDict, Pair
@@ -133,6 +133,12 @@ def valid(line: str):
         return line and not line.startswith('#')
 
 
+class _EntryPointMatch(types.SimpleNamespace):
+    module: str
+    attr: str
+    extras: str
+
+
 class EntryPoint:
     """An entry point as defined by Python packaging conventions.
 
@@ -185,28 +191,27 @@ def load(self) -> Any:
         is indicated by the value, return that module. Otherwise,
         return the named object.
         """
-        match = cast(Match, self.pattern.match(self.value))
-        module = import_module(match.group('module'))
-        attrs = filter(None, (match.group('attr') or '').split('.'))
+        module = import_module(self.module)
+        attrs = filter(None, (self.attr or '').split('.'))
         return functools.reduce(getattr, attrs, module)
 
     @property
     def module(self) -> str:
-        match = self.pattern.match(self.value)
-        assert match is not None
-        return match.group('module')
+        return self._match.module
 
     @property
     def attr(self) -> str:
-        match = self.pattern.match(self.value)
-        assert match is not None
-        return match.group('attr')
+        return self._match.attr
 
     @property
     def extras(self) -> List[str]:
+        return re.findall(r'\w+', self._match.extras or '')
+
+    @property
+    def _match(self) -> _EntryPointMatch:
         match = self.pattern.match(self.value)
         assert match is not None
-        return re.findall(r'\w+', match.group('extras') or '')
+        return _EntryPointMatch(**match.groupdict())
 
     def _for(self, dist):
         vars(self).update(dist=dist)