summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2010-10-06 10:45:36 -0400
committerLance Stout <lancestout@gmail.com>2010-10-06 10:45:36 -0400
commit178608f4c0f48e21e956c9859e85a87e7a7245e1 (patch)
tree2edfcf1f3528ab9505abc46fea2d0ea33945b047 /sleekxmpp/xmlstream
parent19ee6979a5c5be578cbdbffbbe27e5d02997a581 (diff)
downloadslixmpp-178608f4c0f48e21e956c9859e85a87e7a7245e1.tar.gz
slixmpp-178608f4c0f48e21e956c9859e85a87e7a7245e1.tar.bz2
slixmpp-178608f4c0f48e21e956c9859e85a87e7a7245e1.tar.xz
slixmpp-178608f4c0f48e21e956c9859e85a87e7a7245e1.zip
XMLStream cleanup.
Added RestartStream as a top level item in sleekxmpp.xmlstream. Fixed trailing whitespace.
Diffstat (limited to 'sleekxmpp/xmlstream')
-rw-r--r--sleekxmpp/xmlstream/__init__.py1
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/sleekxmpp/xmlstream/__init__.py b/sleekxmpp/xmlstream/__init__.py
index 8533ca20..a653ddc0 100644
--- a/sleekxmpp/xmlstream/__init__.py
+++ b/sleekxmpp/xmlstream/__init__.py
@@ -12,3 +12,4 @@ 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
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index 948b19db..40218dd5 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -486,7 +486,7 @@ class XMLStream(object):
self.event_queue.put(('event', handler, copy.copy(data)))
if handler[2]:
# If the handler is disposable, we will go ahead and
- # remove it now instead of waiting for it to be
+ # remove it now instead of waiting for it to be
# processed in the queue.
with self.__event_handlers_lock:
handler_index = self.__event_handlers[name].index(handler)