summaryrefslogtreecommitdiff
path: root/sleekxmpp/basexmpp.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-07-01 14:45:55 -0700
committerLance Stout <lancestout@gmail.com>2011-07-01 14:45:55 -0700
commit634f5d691bab9855deddc4c201389bb60470d76e (patch)
tree29303420af94646ddac01824ebb4a201606b18e1 /sleekxmpp/basexmpp.py
parent754ac5092a3a37819a71f6565a1e54b3f2547940 (diff)
downloadslixmpp-634f5d691bab9855deddc4c201389bb60470d76e.tar.gz
slixmpp-634f5d691bab9855deddc4c201389bb60470d76e.tar.bz2
slixmpp-634f5d691bab9855deddc4c201389bb60470d76e.tar.xz
slixmpp-634f5d691bab9855deddc4c201389bb60470d76e.zip
Continued reorganization and streamlining.
Diffstat (limited to 'sleekxmpp/basexmpp.py')
-rw-r--r--sleekxmpp/basexmpp.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
index 43ad420f..b188e767 100644
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -167,12 +167,12 @@ class BaseXMPP(XMLStream):
if not module:
try:
module = sleekxmpp.plugins
- module = __import__("%s.%s" % (module.__name__, plugin),
- globals(), locals(), [plugin])
+ module = __import__(str("%s.%s" % (module.__name__, plugin)),
+ globals(), locals(), [str(plugin)])
except ImportError:
module = sleekxmpp.features
- module = __import__("%s.%s" % (module.__name__, plugin),
- globals(), locals(), [plugin])
+ module = __import__(str("%s.%s" % (module.__name__, plugin)),
+ globals(), locals(), [str(plugin)])
if isinstance(module, str):
# We probably want to load a module from outside
# the sleekxmpp package, so leave out the globals().