diff options
author | Lance Stout <lancestout@gmail.com> | 2012-02-17 14:59:56 -0800 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2012-02-17 14:59:56 -0800 |
commit | 7d74a7b0271c709e80f1c25e67a57dcc98d5280a (patch) | |
tree | f1cd5d6130c8a60d943833eba36ca4c6d600e5cb /sleekxmpp/basexmpp.py | |
parent | 9d5eb864d1a370a32f933a77b48363950542c759 (diff) | |
download | slixmpp-7d74a7b0271c709e80f1c25e67a57dcc98d5280a.tar.gz slixmpp-7d74a7b0271c709e80f1c25e67a57dcc98d5280a.tar.bz2 slixmpp-7d74a7b0271c709e80f1c25e67a57dcc98d5280a.tar.xz slixmpp-7d74a7b0271c709e80f1c25e67a57dcc98d5280a.zip |
More extraneous import cleanup.
Diffstat (limited to 'sleekxmpp/basexmpp.py')
-rw-r--r-- | sleekxmpp/basexmpp.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py index ce55eff7..f729132d 100644 --- a/sleekxmpp/basexmpp.py +++ b/sleekxmpp/basexmpp.py @@ -18,7 +18,7 @@ import sys import logging import sleekxmpp -from sleekxmpp import plugins, roster +from sleekxmpp import plugins, features, roster from sleekxmpp.exceptions import IqError, IqTimeout from sleekxmpp.stanza import Message, Presence, Iq, StreamError @@ -204,12 +204,12 @@ class BaseXMPP(XMLStream): # Import the given module that contains the plugin. if not module: try: - module = sleekxmpp.plugins + module = plugins module = __import__( str("%s.%s" % (module.__name__, plugin)), globals(), locals(), [str(plugin)]) except ImportError: - module = sleekxmpp.features + module = features module = __import__( str("%s.%s" % (module.__name__, plugin)), globals(), locals(), [str(plugin)]) |