Try re-ordering initial imports to avoid import bugs

This commit is contained in:
Lance Stout 2013-08-06 15:54:02 -07:00
parent 6401c9aaaa
commit e57e321d33
2 changed files with 5 additions and 6 deletions

View File

@ -6,14 +6,14 @@
See the file LICENSE for copying permission. 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.stanza import Message, Presence, Iq
from sleekxmpp.jid import JID, InvalidJID from sleekxmpp.jid import JID, InvalidJID
from sleekxmpp.xmlstream.stanzabase import ET, ElementBase, register_stanza_plugin from sleekxmpp.xmlstream.stanzabase import ET, ElementBase, register_stanza_plugin
from sleekxmpp.xmlstream.handler import * from sleekxmpp.xmlstream.handler import *
from sleekxmpp.xmlstream import XMLStream, RestartStream from sleekxmpp.xmlstream import XMLStream, RestartStream
from sleekxmpp.xmlstream.matcher import * 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__ from sleekxmpp.version import __version__, __version_info__

View File

@ -18,8 +18,7 @@ import sys
import logging import logging
import threading import threading
import sleekxmpp from sleekxmpp import plugins, roster, stanza
from sleekxmpp import plugins, roster
from sleekxmpp.api import APIRegistry from sleekxmpp.api import APIRegistry
from sleekxmpp.exceptions import IqError, IqTimeout from sleekxmpp.exceptions import IqError, IqTimeout
@ -146,7 +145,7 @@ class BaseXMPP(XMLStream):
#: A reference to :mod:`sleekxmpp.stanza` to make accessing #: A reference to :mod:`sleekxmpp.stanza` to make accessing
#: stanza classes easier. #: stanza classes easier.
self.stanza = sleekxmpp.stanza self.stanza = stanza
self.register_handler( self.register_handler(
Callback('IM', Callback('IM',