Cleanup plugin import logic.

Checking for a 'xep' or 'rfc' attribute is more reliable
for detecting an old style plugin than 'name'.

1 files changed, 9 insertions, 5 deletions

diff --git a/sleekxmpp/plugins/base.py b/sleekxmpp/plugins/base.py
index ec5ed10b..f08023ba 100644
--- a/sleekxmpp/plugins/base.py
+++ b/sleekxmpp/plugins/base.py
@@ -13,8 +13,9 @@
     :license: MIT, see LICENSE for more details
 """
 
-import threading
+import sys
 import logging
+import threading
 
 
 log = logging.getLogger(__name__)
@@ -77,17 +78,20 @@ def load_plugin(name, module=None):
         if not module:
             try:
                 module = 'sleekxmpp.plugins.%s' % name
-                mod = __import__(module, fromlist=[str(name)])
+                __import__(module)
+                mod = sys.modules[module]
             except:
                 module = 'sleekxmpp.features.%s' % name
-                mod = __import__(module, fromlist=[str(name)])
+                __import__(module)
+                mod = sys.modules[module]
         else:
-            mod = __import__(module, fromlist=[str(name)])
+            __import__(module)
+            mod = sys.modules[module]
 
         # Add older style plugins to the registry.
         if hasattr(mod, name):
             plugin = getattr(mod, name)
-            if not hasattr(plugin, 'name'):
+            if hasattr(plugin, 'xep') or hasattr(plugin, 'rfc'):
                 plugin.name = name
                 # Mark the plugin as an older style plugin so
                 # we can work around dependency issues.