From 4c774a77f5eab004764d46d200bea36360aa8499 Mon Sep 17 00:00:00 2001
From: "peng.xu" <peng.xu@zilliz.com>
Date: Sat, 26 Oct 2019 14:03:51 +0800
Subject: [PATCH] fix PluginBase import bug

---
 shards/mishards/router/factory.py |  8 +++-----
 shards/tracer/factory.py          |  3 ++-
 shards/utils/pluginextension.py   | 11 ++++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/shards/mishards/router/factory.py b/shards/mishards/router/factory.py
index 2671cc31..66d549f2 100644
--- a/shards/mishards/router/factory.py
+++ b/shards/mishards/router/factory.py
@@ -1,9 +1,7 @@
 import os
 import logging
 from functools import partial
-# from pluginbase import PluginBase
-# import importlib
-from utils.pluginextension import MiPluginBase
+from utils.pluginextension import MiPluginBase as PluginBase
 
 logger = logging.getLogger(__name__)
 
@@ -11,8 +9,8 @@ here = os.path.abspath(os.path.dirname(__file__))
 get_path = partial(os.path.join, here)
 
 PLUGIN_PACKAGE_NAME = 'router.plugins'
-plugin_base = MiPluginBase(package=PLUGIN_PACKAGE_NAME,
-                           searchpath=[get_path('./plugins')])
+plugin_base = PluginBase(package=PLUGIN_PACKAGE_NAME,
+                         searchpath=[get_path('./plugins')])
 
 
 class RouterFactory(object):
diff --git a/shards/tracer/factory.py b/shards/tracer/factory.py
index 662ae292..9342ca3d 100644
--- a/shards/tracer/factory.py
+++ b/shards/tracer/factory.py
@@ -1,7 +1,8 @@
 import os
 import logging
 from functools import partial
-from pluginbase import PluginBase
+from utils.pluginextension import MiPluginBase as PluginBase
+# from pluginbase import PluginBase
 from tracer import Tracer
 
 
diff --git a/shards/utils/pluginextension.py b/shards/utils/pluginextension.py
index e5339b4f..68413a4e 100644
--- a/shards/utils/pluginextension.py
+++ b/shards/utils/pluginextension.py
@@ -1,13 +1,14 @@
-import importlib
+import importlib.util
 from pluginbase import PluginBase, PluginSource
 
 
 class MiPluginSource(PluginSource):
     def load_plugin(self, name):
-        if '.' in name:
-            raise ImportError('Plugin names cannot contain dots.')
-        with self:
-            return importlib.import_module(self.base.package + '.' + name)
+        plugin = super().load_plugin(name)
+        spec = importlib.util.spec_from_file_location(self.base.package + '.' + name, plugin.__file__)
+        plugin = importlib.util.module_from_spec(spec)
+        spec.loader.exec_module(plugin)
+        return plugin
 
 
 class MiPluginBase(PluginBase):
-- 
GitLab