summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-08-06 15:54:02 -0700
committerLance Stout <lancestout@gmail.com>2013-08-06 15:54:02 -0700
commite57e321d33a698d90053339d93b19e3c773e487c (patch)
treee246e35a37f380eaf23b61c7097a8b96e828a1c9 /sleekxmpp
parent6401c9aaaafc5bb7541d5475e34191e6f0965313 (diff)
downloadslixmpp-e57e321d33a698d90053339d93b19e3c773e487c.tar.gz
slixmpp-e57e321d33a698d90053339d93b19e3c773e487c.tar.bz2
slixmpp-e57e321d33a698d90053339d93b19e3c773e487c.tar.xz
slixmpp-e57e321d33a698d90053339d93b19e3c773e487c.zip
Try re-ordering initial imports to avoid import bugs
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/__init__.py6
-rw-r--r--sleekxmpp/basexmpp.py5
2 files changed, 5 insertions, 6 deletions
diff --git a/sleekxmpp/__init__.py b/sleekxmpp/__init__.py
index 8a489a2a..542bb4b6 100644
--- a/sleekxmpp/__init__.py
+++ b/sleekxmpp/__init__.py
@@ -6,14 +6,14 @@
See the file LICENSE for copying permission.
"""
-from sleekxmpp.basexmpp import BaseXMPP
-from sleekxmpp.clientxmpp import ClientXMPP
-from sleekxmpp.componentxmpp import ComponentXMPP
from sleekxmpp.stanza import Message, Presence, Iq
from sleekxmpp.jid import JID, InvalidJID
from sleekxmpp.xmlstream.stanzabase import ET, ElementBase, register_stanza_plugin
from sleekxmpp.xmlstream.handler import *
from sleekxmpp.xmlstream import XMLStream, RestartStream
from sleekxmpp.xmlstream.matcher import *
+from sleekxmpp.basexmpp import BaseXMPP
+from sleekxmpp.clientxmpp import ClientXMPP
+from sleekxmpp.componentxmpp import ComponentXMPP
from sleekxmpp.version import __version__, __version_info__
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
index 7b608d13..9021bd97 100644
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -18,8 +18,7 @@ import sys
import logging
import threading
-import sleekxmpp
-from sleekxmpp import plugins, roster
+from sleekxmpp import plugins, roster, stanza
from sleekxmpp.api import APIRegistry
from sleekxmpp.exceptions import IqError, IqTimeout
@@ -146,7 +145,7 @@ class BaseXMPP(XMLStream):
#: A reference to :mod:`sleekxmpp.stanza` to make accessing
#: stanza classes easier.
- self.stanza = sleekxmpp.stanza
+ self.stanza = stanza
self.register_handler(
Callback('IM',