From 820d07f30965ef2d7979dd640a7028ba8e3915f7 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Thu, 19 Dec 2013 11:47:31 +0100 Subject: Use strings for ElementTree.iterparse events names Because if cElementTree is not available on the system, ElementTree is used instead, and that version doesn't accept bytes, resulting in an exception. See http://bugs.python.org/issue9257#msg152864 --- sleekxmpp/xmlstream/xmlstream.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index c503cdd2..b9f16f96 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, (b'end', b'start')): - if event == b'start': + for event, xml in ET.iterparse(self.filesocket, ('end', 'start')): + if event == '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 == b'end': + if event == 'end': depth -= 1 if depth == 0: # The stream's root element has closed, -- cgit v1.2.3