summaryrefslogtreecommitdiff
path: root/sleekxmpp/test/sleektest.py
diff options
context:
space:
mode:
authorNathan Fritz <fritzy@netflint.net>2011-08-12 16:35:15 -0700
committerNathan Fritz <fritzy@netflint.net>2011-08-12 16:35:15 -0700
commitbd8c110f00a41917839a0578de68b80c39ee6e16 (patch)
treecc44410ba6e6efe7cfcf1decc8f1b1d8b2692aa7 /sleekxmpp/test/sleektest.py
parent0050c5112428939346397a4d2edfeb313c0fd497 (diff)
parentd7fe724145c2e01d1028dab773fb49414c6856dd (diff)
downloadslixmpp-bd8c110f00a41917839a0578de68b80c39ee6e16.tar.gz
slixmpp-bd8c110f00a41917839a0578de68b80c39ee6e16.tar.bz2
slixmpp-bd8c110f00a41917839a0578de68b80c39ee6e16.tar.xz
slixmpp-bd8c110f00a41917839a0578de68b80c39ee6e16.zip
Merge branch 'exceptions' into develop
Diffstat (limited to 'sleekxmpp/test/sleektest.py')
-rw-r--r--sleekxmpp/test/sleektest.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/sleekxmpp/test/sleektest.py b/sleekxmpp/test/sleektest.py
index cb5031f7..d28ffd5d 100644
--- a/sleekxmpp/test/sleektest.py
+++ b/sleekxmpp/test/sleektest.py
@@ -16,6 +16,7 @@ import sleekxmpp
from sleekxmpp import ClientXMPP, ComponentXMPP
from sleekxmpp.stanza import Message, Iq, Presence
from sleekxmpp.test import TestSocket, TestLiveSocket
+from sleekxmpp.exceptions import XMPPError, IqTimeout, IqError
from sleekxmpp.xmlstream import ET, register_stanza_plugin
from sleekxmpp.xmlstream import ElementBase, StanzaBase
from sleekxmpp.xmlstream.tostring import tostring