diff options
| -rw-r--r-- | sleekxmpp/__init__.py | 11 | ||||
| -rw-r--r-- | sleekxmpp/basexmpp.py | 4 | ||||
| -rw-r--r-- | sleekxmpp/stanza/iq.py | 1 | ||||
| -rw-r--r-- | sleekxmpp/stanza/message.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/stanza/nick.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/stanza/roster.py | 3 | ||||
| -rw-r--r-- | sleekxmpp/xmlstream/xmlstream.py | 3 |
7 files changed, 2 insertions, 24 deletions
diff --git a/sleekxmpp/__init__.py b/sleekxmpp/__init__.py index a996999a..2696ca3b 100644 --- a/sleekxmpp/__init__.py +++ b/sleekxmpp/__init__.py @@ -14,24 +14,13 @@ from . xmlstream.xmlstream import XMLStream from . xmlstream.xmlstream import RestartStream from . xmlstream.matcher.xmlmask import MatchXMLMask from . xmlstream.matcher.xpath import MatchXPath -from . xmlstream.matcher.many import MatchMany from . xmlstream.handler.callback import Callback -from . xmlstream.stanzabase import StanzaBase -from . xmlstream import xmlstream as xmlstreammod -from . stanza.message import Message -from . stanza.iq import Iq -import time import logging import base64 import sys import random -import copy -from . import plugins from xml.etree.cElementTree import tostring -from xml.etree.cElementTree import Element -from cStringIO import StringIO -#from . import stanza srvsupport = True try: import dns.resolver diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py index 2dfa69af..1cd87f52 100644 --- a/sleekxmpp/basexmpp.py +++ b/sleekxmpp/basexmpp.py @@ -9,11 +9,8 @@ from __future__ import with_statement, unicode_literals from xml.etree import cElementTree as ET -from . xmlstream.xmlstream import XMLStream from . xmlstream.matcher.xmlmask import MatchXMLMask -from . xmlstream.matcher.many import MatchMany from . xmlstream.handler.xmlcallback import XMLCallback -from . xmlstream.handler.xmlwaiter import XMLWaiter from . xmlstream.handler.waiter import Waiter from . xmlstream.handler.callback import Callback from . import plugins @@ -23,7 +20,6 @@ from . stanza.presence import Presence from . stanza.roster import Roster from . stanza.nick import Nick from . stanza.htmlim import HTMLIM -from . stanza.error import Error import logging import threading diff --git a/sleekxmpp/stanza/iq.py b/sleekxmpp/stanza/iq.py index 2b3ca83b..fe904478 100644 --- a/sleekxmpp/stanza/iq.py +++ b/sleekxmpp/stanza/iq.py @@ -7,7 +7,6 @@ """ from .. xmlstream.stanzabase import StanzaBase from xml.etree import cElementTree as ET -from . error import Error from .. xmlstream.handler.waiter import Waiter from .. xmlstream.matcher.id import MatcherId from . rootstanza import RootStanza diff --git a/sleekxmpp/stanza/message.py b/sleekxmpp/stanza/message.py index 38341809..136664b9 100644 --- a/sleekxmpp/stanza/message.py +++ b/sleekxmpp/stanza/message.py @@ -6,8 +6,6 @@ See the file license.txt for copying permission. """ from .. xmlstream.stanzabase import StanzaBase -from xml.etree import cElementTree as ET -from . error import Error from . rootstanza import RootStanza class Message(RootStanza): diff --git a/sleekxmpp/stanza/nick.py b/sleekxmpp/stanza/nick.py index ac7e3604..33b1c589 100644 --- a/sleekxmpp/stanza/nick.py +++ b/sleekxmpp/stanza/nick.py @@ -5,7 +5,7 @@ See the file license.txt for copying permission. """ -from .. xmlstream.stanzabase import ElementBase, ET +from .. xmlstream.stanzabase import ElementBase class Nick(ElementBase): namespace = 'http://jabber.org/nick/nick' diff --git a/sleekxmpp/stanza/roster.py b/sleekxmpp/stanza/roster.py index 1fefc180..afe8ce2a 100644 --- a/sleekxmpp/stanza/roster.py +++ b/sleekxmpp/stanza/roster.py @@ -5,8 +5,7 @@ See the file license.txt for copying permission. """ -from .. xmlstream.stanzabase import ElementBase, ET, JID -import logging +from .. xmlstream.stanzabase import ElementBase, ET class Roster(ElementBase): namespace = 'jabber:iq:roster' diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index 89039428..e403cfef 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -14,15 +14,12 @@ except ImportError: from . import statemachine from . stanzabase import StanzaBase from xml.etree import cElementTree -from xml.parsers import expat import logging import random import socket import threading import time import traceback -import types -import xml.sax.saxutils from . import scheduler HANDLER_THREADS = 1 |