diff options
| -rw-r--r-- | sleekxmpp/basexmpp.py | 9 | ||||
| -rw-r--r-- | sleekxmpp/clientxmpp.py | 20 | ||||
| -rw-r--r-- | sleekxmpp/componentxmpp.py | 11 |
3 files changed, 13 insertions, 27 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py index e4fd03a1..ce55eff7 100644 --- a/sleekxmpp/basexmpp.py +++ b/sleekxmpp/basexmpp.py @@ -15,22 +15,21 @@ from __future__ import with_statement, unicode_literals import sys -import copy import logging import sleekxmpp from sleekxmpp import plugins, roster from sleekxmpp.exceptions import IqError, IqTimeout -from sleekxmpp.stanza import Message, Presence, Iq, Error, StreamError +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, tostring +from sleekxmpp.xmlstream import XMLStream, JID from sleekxmpp.xmlstream import ET, register_stanza_plugin -from sleekxmpp.xmlstream.matcher import * -from sleekxmpp.xmlstream.handler import * +from sleekxmpp.xmlstream.matcher import MatchXPath +from sleekxmpp.xmlstream.handler import Callback log = logging.getLogger(__name__) diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py index d2a6bfee..458af2b7 100644 --- a/sleekxmpp/clientxmpp.py +++ b/sleekxmpp/clientxmpp.py @@ -15,22 +15,12 @@ from __future__ import absolute_import, unicode_literals import logging -import base64 -import sys -import hashlib -import random -import threading - -import sleekxmpp -from sleekxmpp import plugins -from sleekxmpp import stanza -from sleekxmpp import features + +from sleekxmpp.stanza import StreamFeatures from sleekxmpp.basexmpp import BaseXMPP -from sleekxmpp.stanza import * -from sleekxmpp.xmlstream import XMLStream, RestartStream -from sleekxmpp.xmlstream import StanzaBase, ET, register_stanza_plugin -from sleekxmpp.xmlstream.matcher import * -from sleekxmpp.xmlstream.handler import * +from sleekxmpp.xmlstream import XMLStream +from sleekxmpp.xmlstream.matcher import MatchXPath +from sleekxmpp.xmlstream.handler import Callback # Flag indicating if DNS SRV records are available for use. try: diff --git a/sleekxmpp/componentxmpp.py b/sleekxmpp/componentxmpp.py index 5b16c5ef..df23c2f6 100644 --- a/sleekxmpp/componentxmpp.py +++ b/sleekxmpp/componentxmpp.py @@ -15,17 +15,14 @@ from __future__ import absolute_import import logging -import base64 import sys import hashlib -from sleekxmpp import plugins -from sleekxmpp import stanza from sleekxmpp.basexmpp import BaseXMPP -from sleekxmpp.xmlstream import XMLStream, RestartStream -from sleekxmpp.xmlstream import StanzaBase, ET -from sleekxmpp.xmlstream.matcher import * -from sleekxmpp.xmlstream.handler import * +from sleekxmpp.xmlstream import XMLStream +from sleekxmpp.xmlstream import ET +from sleekxmpp.xmlstream.matcher import MatchXPath +from sleekxmpp.xmlstream.handler import Callback log = logging.getLogger(__name__) |