summaryrefslogtreecommitdiff
path: root/sleekxmpp/basexmpp.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-08-04 22:37:22 -0700
committerLance Stout <lancestout@gmail.com>2011-08-04 22:37:22 -0700
commit47bc50d9fbbe8d72b589a6360aa8b5f32d6ba74b (patch)
treebea40ff79dc92dd38c1152905658dde1e84df96b /sleekxmpp/basexmpp.py
parent93a4a3f8a0f64eed846895365fa3da059bbf5ea1 (diff)
downloadslixmpp-47bc50d9fbbe8d72b589a6360aa8b5f32d6ba74b.tar.gz
slixmpp-47bc50d9fbbe8d72b589a6360aa8b5f32d6ba74b.tar.bz2
slixmpp-47bc50d9fbbe8d72b589a6360aa8b5f32d6ba74b.tar.xz
slixmpp-47bc50d9fbbe8d72b589a6360aa8b5f32d6ba74b.zip
Cosmetic PEP8 fixes.
Diffstat (limited to 'sleekxmpp/basexmpp.py')
-rw-r--r--sleekxmpp/basexmpp.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
index 07726a41..4d9a8964 100644
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -141,7 +141,7 @@ class BaseXMPP(XMLStream):
def process(self, *args, **kwargs):
"""
Overrides XMLStream.process.
-
+
Initialize the XML streams and begin processing events.
The number of threads used for processing stream events is determined
@@ -185,12 +185,14 @@ class BaseXMPP(XMLStream):
if not module:
try:
module = sleekxmpp.plugins
- module = __import__(str("%s.%s" % (module.__name__, plugin)),
- globals(), locals(), [str(plugin)])
+ module = __import__(
+ str("%s.%s" % (module.__name__, plugin)),
+ globals(), locals(), [str(plugin)])
except ImportError:
module = sleekxmpp.features
- module = __import__(str("%s.%s" % (module.__name__, plugin)),
- globals(), locals(), [str(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().