Use single call to importlib.metadata.entry_points for all groups

catkin · Sep 4, 2023 · 4da343a · 4da343a
1 parent b49a395
commit 4da343a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/catkin_tools/commands/catkin.py b/catkin_tools/commands/catkin.py
@@ -31,11 +31,6 @@
 CATKIN_COMMAND_VERB_GROUP = 'catkin_tools.commands.catkin.verbs'
 
 
-@functools.lru_cache(maxsize=None)
-def _get_verb_entrypoints():
-    return list(entry_points(group=CATKIN_COMMAND_VERB_GROUP))
-
-
 def list_verbs():
     verbs = []
     for entry_point in _get_verb_entrypoints():

diff --git a/catkin_tools/utils.py b/catkin_tools/utils.py
@@ -14,15 +14,19 @@
 
 import os
 import sys
+import functools
 
-if sys.version_info >= (3, 10):
-    from importlib.metadata import entry_points
-else:
-    import importlib.metadata
 
-    def entry_points(*, group):
-        for ep in importlib.metadata.entry_points().get(group, []):
-            yield ep
+def entry_points(*, group):
+    @functools.lru_cache(maxsize=None)
+    def _entry_points():
+        from importlib.metadata import entry_points
+        return entry_points()
+
+    if sys.version_info >= (3, 10):
+        return _entry_points().select(group=group)
+    else:
+        return _entry_points().get(group, [])
 
 
 def which(program):