summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lstout@kestrel.cs.clemson.edu>2010-10-01 10:09:10 -0400
committerLance Stout <lstout@kestrel.cs.clemson.edu>2010-10-01 10:09:10 -0400
commit55cfe69fefde4cbb1b10f2518f94f652db819d38 (patch)
tree03fdc1113405a6563f59ff4ec6637bd8583c7a6f /sleekxmpp
parent6de87a1cbf3be9c0c0bc1b10e8dfa9c56910514e (diff)
downloadslixmpp-55cfe69fefde4cbb1b10f2518f94f652db819d38.tar.gz
slixmpp-55cfe69fefde4cbb1b10f2518f94f652db819d38.tar.bz2
slixmpp-55cfe69fefde4cbb1b10f2518f94f652db819d38.tar.xz
slixmpp-55cfe69fefde4cbb1b10f2518f94f652db819d38.zip
Cleaned up trailing whitespace.
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index 0de4d035..d37d2920 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -117,7 +117,8 @@ class XMLStream(object):
send_xml -- Send an XML string on the stream.
set_socket -- Set the stream's socket and generate a new
filesocket.
- start_stream_handler -- Meant to be overridden.
+ start_stream_handler -- Perform any stream initialization such
+ as handshakes.
start_tls -- Establish a TLS connection and restart
the stream.
"""
@@ -313,7 +314,12 @@ class XMLStream(object):
return False
def start_stream_handler(self, xml):
- """Meant to be overridden"""
+ """
+ Perform any initialization actions, such as handshakes, once the
+ stream header has been sent.
+
+ Meant to be overridden.
+ """
pass
def register_stanza(self, stanza_class):
@@ -464,7 +470,7 @@ class XMLStream(object):
if self.state['is client']:
self.send_raw(self.stream_header)
# The call to self.__read_xml will block and prevent
- # the body of the loop from running until a diconnect
+ # the body of the loop from running until a disconnect
# occurs. After any reconnection, the stream header will
# be resent and processing will resume.
while self.run and self.__read_xml():