Merge pull request #699 from astrofrog/fix-plugin-loading

Fix plugin loading
glue-viz · Aug 8, 2015 · 96f83aa · 96f83aa
2 parents 7372b58 + 785b104
commit 96f83aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -9,7 +9,7 @@ v0.6 (unreleased)
 v0.5.2 (unreleased)
 -------------------
 
-* No changes yet
+* Fix loading of plugins with setuptools < 11.3
 
 v0.5.1 (2015-07-06)
 -------------------

diff --git a/glue/main.py b/glue/main.py
@@ -255,14 +255,15 @@ def load_plugins():
     # where ``setup`` is a function that does whatever is needed to set up the
     # plugin, such as add items to various registries.
 
-    logger.info("Loading external plugins")
+    import setuptools
+    logger.info("Loading external plugins using setuptools=={0}".format(setuptools.__version__))
     from ._plugin_helpers import iter_plugin_entry_points
     for item in iter_plugin_entry_points():
         if item.module_name in _loaded_plugins:
             logger.info("Plugin {0} already loaded".format(item.name))
             continue
         try:
-            function = item.resolve()
+            function = item.load()
             function()
         except Exception as exc:
             logger.info("Loading plugin {0} failed (Exception: {1})".format(item.name, exc))