From 60526b9971f5a53f9aff7e075719d486ec3a99f9 Mon Sep 17 00:00:00 2001
From: Sijis Aviles <sijis.aviles+github@gmail.com>
Date: Fri, 7 Oct 2022 00:56:40 -0500
Subject: [PATCH] fix: import entrypoint module lookup (#1603)

* fix: import entrypoint module lookup

This uses a more appropriate approach to find the plugins file location.

* docs: add info to CHANGES
---
 CHANGES.rst     | 1 +
 errbot/utils.py | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 32fd71b7e..c200bb6b8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -22,6 +22,7 @@ fixes:
 - chore/setup: fix exception when installing on python <3.7 (#1585)
 - docs: typos (#1589, #1594)
 - chore: simplify isort config using black (#1595)
+- fix: detecting entrypoint module paths (#1603)
 
 
 v6.1.9 (2022-06-11)
diff --git a/errbot/utils.py b/errbot/utils.py
index fd7f2694b..634e0bffa 100644
--- a/errbot/utils.py
+++ b/errbot/utils.py
@@ -7,6 +7,7 @@
 import sys
 import time
 from functools import wraps
+from importlib.util import find_spec
 
 try:
     from importlib.metadata import entry_points
@@ -205,7 +206,8 @@ def collect_roots(base_paths: List, file_sig: str = "*.plug") -> List:
 def entry_point_plugins(group):
     paths = []
     for entry_point in entry_points().get(group, []):
-        paths.append(entry_point.dist._path.parent)
+        lib_paths = find_spec(entry_point.module).submodule_search_locations
+        paths.extend(lib_paths)
     return paths