Merge pull request #1284 from HaoZeke/cleanUpPlugins

MAINT: Use importlib, pkgutil over __import__

asv/plugin_manager.py

@@ -2,6 +2,7 @@
 
 import sys
 import pkgutil
+import importlib
 
 from . import commands, plugins
 from .console import log
@@ -23,28 +24,37 @@ def __init__(self):
 
     def load_plugins(self, package):
         prefix = package.__name__ + "."
-        for module_finder, name, ispkg in pkgutil.iter_modules(
-            package.__path__, prefix
-        ):
+        for module_finder, name, ispkg in pkgutil.iter_modules(package.__path__, prefix):
             try:
-                __import__(name)
-                mod = sys.modules[name]
+                mod = importlib.import_module(name)
                 self.init_plugin(mod)
                 self._plugins.append(mod)
             except ModuleNotFoundError as err:
                 log.error(f"Couldn't load {name} because\n{err}")
                 continue  # Couldn't find mamba
 
+    def _load_plugin_by_name(self, name):
+        prefix = plugins.__name__ + "."
+        for module_finder, module_name, ispkg in pkgutil.iter_modules(plugins.__path__, prefix):
+            if name in module_name:
+                mod = importlib.import_module(module_name)
+                return mod
+        return None
+
     def import_plugin(self, name):
         extended = False
         if name.startswith("."):
             extended = True
             sys.path.insert(0, ".")
             name = name[1:]
         try:
-            mod = __import__(name, {}, {}, [], level=0)
-            self.init_plugin(mod)
-            self._plugins.append(mod)
+            if extended:
+                mod = importlib.import_module(name)
+            else:
+                mod = self._load_plugin_by_name(name)
+            if mod:
+                self.init_plugin(mod)
+                self._plugins.append(mod)
         finally:
             if extended:
                 del sys.path[0]

test/asv.conf.json

@@ -26,7 +26,7 @@
 
     "version": 1,
 
-    "plugins": [".example_plugin"],
+    "plugins": [".example_plugin", "github"],
 
     "benchmark_dir": "benchmark",