Merge branch 'add-ep-module-attr' into 'master'

Add `module` and `attr` properties to EntryPoint

See merge request python-devs/importlib_metadata!116

Author: jaraco

importlib_metadata/__init__.py

@@ -96,6 +96,16 @@ def load(self):
         attrs = filter(None, (match.group('attr') or '').split('.'))
         return functools.reduce(getattr, attrs, module)
 
+    @property
+    def module(self):
+        match = self.pattern.match(self.value)
+        return match.group('module')
+
+    @property
+    def attr(self):
+        match = self.pattern.match(self.value)
+        return match.group('attr')
+
     @property
     def extras(self):
         match = self.pattern.match(self.value)

importlib_metadata/docs/changelog.rst

@@ -2,6 +2,11 @@
  importlib_metadata NEWS
 =========================
 
+v1.6.0
+======
+
+* Added ``module`` and ``attr`` attributes to ``EntryPoint``
+
 v1.5.2
 ======
 

importlib_metadata/docs/using.rst

@@ -70,7 +70,9 @@ Entry points
 The ``entry_points()`` function returns a dictionary of all entry points,
 keyed by group.  Entry points are represented by ``EntryPoint`` instances;
 each ``EntryPoint`` has a ``.name``, ``.group``, and ``.value`` attributes and
-a ``.load()`` method to resolve the value::
+a ``.load()`` method to resolve the value.  There are also ``.module``,
+``.attr``, and ``.extras`` attributes for getting the components of the
+``.value`` attribute::
 
     >>> eps = entry_points()
     >>> list(eps)
@@ -79,6 +81,12 @@ a ``.load()`` method to resolve the value::
     >>> wheel = [ep for ep in scripts if ep.name == 'wheel'][0]
     >>> wheel
     EntryPoint(name='wheel', value='wheel.cli:main', group='console_scripts')
+    >>> wheel.module
+    'wheel.cli'
+    >>> wheel.attr
+    'main'
+    >>> wheel.extras
+    []
     >>> main = wheel.load()
     >>> main
     <function main at 0x103528488>

importlib_metadata/tests/test_main.py

@@ -250,3 +250,9 @@ def test_json_dump(self):
         """
         with self.assertRaises(Exception):
             json.dumps(self.ep)
+
+    def test_module(self):
+        assert self.ep.module == 'value'
+
+    def test_attr(self):
+        assert self.ep.attr is None