Commit 8b29900b authored by Lance Stout's avatar Lance Stout

Fix some Python3 compatibility issues.

parent def34f0e
......@@ -75,7 +75,7 @@ def _cache(key, parts, locked):
with JID_CACHE_LOCK:
while len(JID_CACHE) > JID_CACHE_MAX_SIZE:
found = None
for key, item in JID_CACHE.iteritems():
for key, item in JID_CACHE.items():
if not item[1]: # if not locked
found = key
break
......
......@@ -550,7 +550,7 @@ class XMLStream(object):
cert.verify(self._expected_server_name, self._der_cert)
except cert.CertificateError as err:
if not self.event_handled('ssl_invalid_cert'):
log.error(err.message)
log.error(err)
self.disconnect(send_close=False)
else:
self.event('ssl_invalid_cert',
......@@ -859,7 +859,7 @@ class XMLStream(object):
cert.verify(self._expected_server_name, self._der_cert)
except cert.CertificateError as err:
if not self.event_handled('ssl_invalid_cert'):
log.error(err.message)
log.error(err)
self.disconnect(self.auto_reconnect, send_close=False)
else:
self.event('ssl_invalid_cert', pem_cert, direct=True)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment