diff options
| author | Lance Stout <lancestout@gmail.com> | 2013-07-29 02:24:33 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2013-07-29 02:24:33 -0700 |
| commit | d439c4f21515813b69f8e39d430cee8ca9a3c946 (patch) | |
| tree | e8a4970b42759c9fcebe01a18a56bddaf0d88214 /sleekxmpp/basexmpp.py | |
| parent | 85bc6f530178f3b049ea2ae064f168b77aeee332 (diff) | |
| parent | a9f2e1482ca65a919a7a9f0c44af7f9f51907887 (diff) | |
| download | slixmpp-d439c4f21515813b69f8e39d430cee8ca9a3c946.tar.gz slixmpp-d439c4f21515813b69f8e39d430cee8ca9a3c946.tar.bz2 slixmpp-d439c4f21515813b69f8e39d430cee8ca9a3c946.tar.xz slixmpp-d439c4f21515813b69f8e39d430cee8ca9a3c946.zip | |
Merge pull request #252 from jpcaruana/develop
refactor : optimize imports + replace mutable argument (a list) in StateMachine constructor
Diffstat (limited to 'sleekxmpp/basexmpp.py')
| -rw-r--r-- | sleekxmpp/basexmpp.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py index a54e4bb6..7b608d13 100644 --- a/sleekxmpp/basexmpp.py +++ b/sleekxmpp/basexmpp.py @@ -19,14 +19,13 @@ import logging import threading import sleekxmpp -from sleekxmpp import plugins, features, roster +from sleekxmpp import plugins, roster from sleekxmpp.api import APIRegistry from sleekxmpp.exceptions import IqError, IqTimeout from sleekxmpp.stanza import Message, Presence, Iq, StreamError from sleekxmpp.stanza.roster import Roster from sleekxmpp.stanza.nick import Nick -from sleekxmpp.stanza.htmlim import HTMLIM from sleekxmpp.xmlstream import XMLStream, JID from sleekxmpp.xmlstream import ET, register_stanza_plugin @@ -34,8 +33,7 @@ from sleekxmpp.xmlstream.matcher import MatchXPath from sleekxmpp.xmlstream.handler import Callback from sleekxmpp.xmlstream.stanzabase import XML_NS -from sleekxmpp.features import * -from sleekxmpp.plugins import PluginManager, register_plugin, load_plugin +from sleekxmpp.plugins import PluginManager, load_plugin log = logging.getLogger(__name__) |