Handle deprecation of importlib SelectableGroups dict interface

python/importlib_metadata#298
brechtm · Dec 13, 2021 · 7bbf2af · 7bbf2af
1 parent 28545fd
commit 7bbf2af
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -58,6 +58,8 @@ Fixed:
   styled (now mapped to the *menu cascade style*).
 * Typos in code and documentation (PR #277 by Tim Gates, PR #281 by Filipe
   Tavares)
+* Handle deprecation of importlib SelectableGroups dict interface (Python 3.10
+  and importlib_metadata 3.6)
 
 
 Release 0.5.3 (2021-06-16)

diff --git a/src/rinoh/resource.py b/src/rinoh/resource.py
@@ -51,7 +51,11 @@ def parse_string(cls, resource_name, source):
 
     @class_property
     def installed_resources(cls):
-        for entry_point in ilm.entry_points()[cls.entry_point_group]:
+        try:    # Python >= 3.10 and importlib_metadata >= 3.6
+            entry_points = ilm.entry_points(group=cls.entry_point_group)
+        except TypeError:
+            entry_points = ilm.entry_points()[cls.entry_point_group]
+        for entry_point in entry_points:
             yield entry_point.name, entry_point
 
     @classmethod