summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorNathan Fritz <nathan@andyet.net>2010-10-14 16:08:50 -0700
committerNathan Fritz <nathan@andyet.net>2010-10-14 16:08:50 -0700
commitaeb7999e6af33cf1c7197fa68ba826552c6cf0dd (patch)
treef37f24b2af92654a59d7bd1101b23bd29cd51b2b /sleekxmpp
parent84683323812a7aecb2f2abc69272d714f69b23bb (diff)
downloadslixmpp-aeb7999e6af33cf1c7197fa68ba826552c6cf0dd.tar.gz
slixmpp-aeb7999e6af33cf1c7197fa68ba826552c6cf0dd.tar.bz2
slixmpp-aeb7999e6af33cf1c7197fa68ba826552c6cf0dd.tar.xz
slixmpp-aeb7999e6af33cf1c7197fa68ba826552c6cf0dd.zip
don't import statemachine
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/test/sleektest.py2
-rw-r--r--sleekxmpp/xmlstream/__init__.py1
2 files changed, 1 insertions, 2 deletions
diff --git a/sleekxmpp/test/sleektest.py b/sleekxmpp/test/sleektest.py
index fa53bf73..89e3712f 100644
--- a/sleekxmpp/test/sleektest.py
+++ b/sleekxmpp/test/sleektest.py
@@ -524,7 +524,7 @@ class SleekTest(unittest.TestCase):
# Apply closing elements so that we can construct
# XML objects for comparison.
header2 = header + '</stream:stream>'
- sent_header2 = sent_header + '</stream:stream>'
+ sent_header2 = sent_header + b'</stream:stream>'
xml = self.parse_xml(header2)
sent_xml = self.parse_xml(sent_header2)
diff --git a/sleekxmpp/xmlstream/__init__.py b/sleekxmpp/xmlstream/__init__.py
index 09514958..981f052d 100644
--- a/sleekxmpp/xmlstream/__init__.py
+++ b/sleekxmpp/xmlstream/__init__.py
@@ -9,7 +9,6 @@
from sleekxmpp.xmlstream.jid import JID
from sleekxmpp.xmlstream.scheduler import Scheduler
from sleekxmpp.xmlstream.stanzabase import StanzaBase, ElementBase, ET
-from sleekxmpp.xmlstream.statemachine import StateMachine
from sleekxmpp.xmlstream.tostring import tostring
from sleekxmpp.xmlstream.xmlstream import XMLStream, RESPONSE_TIMEOUT
from sleekxmpp.xmlstream.xmlstream import RestartStream