summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-12-22 01:10:19 -0800
committerLance Stout <lancestout@gmail.com>2013-12-22 01:10:19 -0800
commitdf9ad823360dd7fd8472d05d072bc4529819ddaa (patch)
tree956d23e12aa8c6a44943726f3e791d5e344f005f /sleekxmpp
parentc183fd5e3513c49cd704a794d5269880f4c7abfd (diff)
downloadslixmpp-df9ad823360dd7fd8472d05d072bc4529819ddaa.tar.gz
slixmpp-df9ad823360dd7fd8472d05d072bc4529819ddaa.tar.bz2
slixmpp-df9ad823360dd7fd8472d05d072bc4529819ddaa.tar.xz
slixmpp-df9ad823360dd7fd8472d05d072bc4529819ddaa.zip
Undo event name fix, due to breakage in Py2.x
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index b9f16f96..c503cdd2 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -1498,8 +1498,8 @@ class XMLStream(object):
"""
depth = 0
root = None
- for event, xml in ET.iterparse(self.filesocket, ('end', 'start')):
- if event == 'start':
+ for event, xml in ET.iterparse(self.filesocket, (b'end', b'start')):
+ if event == b'start':
if depth == 0:
# We have received the start of the root element.
root = xml
@@ -1516,7 +1516,7 @@ class XMLStream(object):
# exponential backoff for new reconnect attempts.
self.reconnect_delay = 1.0
depth += 1
- if event == 'end':
+ if event == b'end':
depth -= 1
if depth == 0:
# The stream's root element has closed,