From a9de9091ae1d08fda52eb20d0027259fa3dd2ebe Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Mon, 25 Sep 2023 15:23:57 -0500
Subject: [PATCH] Fix compatibility with Python < 3.10 importlib.metadata
 (#585)

It appears that the Distribution.name property was introduced in Python
3.10.

Fixes: 5f9f5fff95b8c
---
 colcon_core/extension_point.py | 7 ++++---
 test/test_extension_point.py   | 6 +++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/colcon_core/extension_point.py b/colcon_core/extension_point.py
index ce8eb383..ff348ba5 100644
--- a/colcon_core/extension_point.py
+++ b/colcon_core/extension_point.py
@@ -53,9 +53,10 @@ def get_all_extension_points():
     entry_points = defaultdict(dict)
     seen = set()
     for dist in distributions():
-        if dist.name in seen:
+        dist_name = dist.metadata['Name']
+        if dist_name in seen:
             continue
-        seen.add(dist.name)
+        seen.add(dist_name)
         for entry_point in dist.entry_points:
             # skip groups which are not registered as extension points
             if entry_point.group not in colcon_extension_points:
@@ -69,7 +70,7 @@ def get_all_extension_points():
                     f"from '{dist._path}' "
                     f"overwriting '{previous}'")
             entry_points[entry_point.group][entry_point.name] = \
-                (entry_point.value, dist.name, dist.version)
+                (entry_point.value, dist_name, dist.version)
     return entry_points
 
 
diff --git a/test/test_extension_point.py b/test/test_extension_point.py
index 1cfce2a1..7111b796 100644
--- a/test/test_extension_point.py
+++ b/test/test_extension_point.py
@@ -28,13 +28,17 @@ class Dist():
     version = '0.0.0'
 
     def __init__(self, entry_points):
-        self.name = f'dist-{id(self)}'
+        self.metadata = {'Name': f'dist-{id(self)}'}
         self._entry_points = entry_points
 
     @property
     def entry_points(self):
         return list(self._entry_points)
 
+    @property
+    def name(self):
+        return self.metadata['Name']
+
 
 def iter_entry_points(*, group=None):
     if group == EXTENSION_POINT_GROUP_NAME: