diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-12-14 09:37:45 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-12-14 09:37:45 -0800 |
| commit | f431bbfca2b9862f954e25d7dd234a9131bc2ee1 (patch) | |
| tree | 2d82e0a0a8fc3017cb60b9280e79847c6c50446b | |
| parent | 6f8a4f83549ab1716ddca55c05518f3867eb9213 (diff) | |
| parent | 8b29900be459dffcb32a9fc106caebbbf93e5b33 (diff) | |
| download | slixmpp-f431bbfca2b9862f954e25d7dd234a9131bc2ee1.tar.gz slixmpp-f431bbfca2b9862f954e25d7dd234a9131bc2ee1.tar.bz2 slixmpp-f431bbfca2b9862f954e25d7dd234a9131bc2ee1.tar.xz slixmpp-f431bbfca2b9862f954e25d7dd234a9131bc2ee1.zip | |
Merge branch 'master' into develop
| -rw-r--r-- | sleekxmpp/jid.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/xmlstream/xmlstream.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sleekxmpp/jid.py b/sleekxmpp/jid.py index 8f1a81d4..bf0c1970 100644 --- a/sleekxmpp/jid.py +++ b/sleekxmpp/jid.py @@ -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 diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index bea6e88f..7955fee5 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -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) |