no longer use pkg_resource

gawel · Jan 3, 2025 · 2761f29 · 2761f29
1 parent f216c72
commit 2761f29
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 21 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -241,6 +241,6 @@
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
 #texinfo_show_urls = 'footnote'
 
-import pkg_resources
-version = pkg_resources.get_distribution("irc3").version
+from importlib.metadata import version
+version = version("irc3")
 release = version
diff --git a/irc3/base.py b/irc3/base.py
@@ -5,24 +5,15 @@
 import signal
 import logging
 import logging.config
+from importlib import metadata
 from . import utils
 from . import config
 from .compat import asyncio
 from .compat import reload_module
 from collections import defaultdict
 
-try:
-    import pkg_resources
-    from pkg_resources import iter_entry_points
-    HAS_PKG_RESOURCES = True
-except ImportError:  # pragma: no cover
-    HAS_PKG_RESOURCES = False
-    version = ''
-else:
-    try:
-        version = pkg_resources.get_distribution('irc3').version
-    except pkg_resources.DistributionNotFound:
-        version = ''
+
+version = metadata.version('irc3')
 
 
 class Registry:
@@ -200,14 +191,17 @@ def include(self, *modules, **kwargs):
                 try:
                     module = utils.maybedotted(module)
                 except LookupError as exc:
-                    if HAS_PKG_RESOURCES:
-                        entry_points = iter_entry_points(
-                            'irc3.loader',
-                            module
-                        )
+                    entry_points = metadata.entry_points()
+                    entry_points = [
+                        eps for eps in entry_points
+                        if eps.group == 'irc3.loader'
+                        and eps.name == module
+                    ]
+                    if entry_points:
+                        eps = entry_points[0]
                         try:
-                            module = next(entry_points).load()
-                        except StopIteration:
+                            module = eps.load()
+                        except ImportError:
                             raise exc
                     else:
                         raise exc