Make sure each EntryPoint carries it's Distribution information

Author: s0undt3ch

importlib_metadata/__init__.py

@@ -53,7 +53,7 @@ def name(self):
 
 
 class EntryPoint(
-    PyPy_repr, collections.namedtuple('EntryPointBase', 'name value group')
+    PyPy_repr, collections.namedtuple('EntryPointBase', 'dist name value group')
 ):
     """An entry point as defined by Python packaging conventions.
 
@@ -109,20 +109,20 @@ def extras(self):
         return list(re.finditer(r'\w+', match.group('extras') or ''))
 
     @classmethod
-    def _from_config(cls, config):
+    def _from_config(cls, dist, config):
         return [
-            cls(name, value, group)
+            cls(dist, name, value, group)
             for group in config.sections()
             for name, value in config.items(group)
         ]
 
     @classmethod
-    def _from_text(cls, text):
+    def _from_text(cls, dist, text):
         config = ConfigParser(delimiters='=')
         # case sensitive: https://stackoverflow.com/q/1611799/812183
         config.optionxform = str
         config.read_string(text)
-        return EntryPoint._from_config(config)
+        return EntryPoint._from_config(dist, config)
 
     def __iter__(self):
         """
@@ -261,14 +261,19 @@ def metadata(self):
         )
         return email.message_from_string(text)
 
+    @property
+    def name(self):
+        """Return the 'Name' metadata for the distribution package."""
+        return self.metadata['Name']
+
     @property
     def version(self):
         """Return the 'Version' metadata for the distribution package."""
         return self.metadata['Version']
 
     @property
     def entry_points(self):
-        return EntryPoint._from_text(self.read_text('entry_points.txt'))
+        return EntryPoint._from_text(self, self.read_text('entry_points.txt'))
 
     @property
     def files(self):

tests/test_api.py

@@ -69,6 +69,13 @@ def test_entry_points(self):
         self.assertEqual(ep.value, 'mod:main')
         self.assertEqual(ep.extras, [])
 
+    def test_entry_points_distribution(self):
+        entries = dict(entry_points()['entries'])
+        for entry in ("main", "ns:sub"):
+            ep = entries[entry]
+            self.assertEqual(ep.dist.name, "distinfo-pkg")
+            self.assertEqual(ep.dist.version, "1.0.0")
+
     def test_metadata_for_this_package(self):
         md = metadata('egginfo-pkg')
         assert md['author'] == 'Steven Ma'