Philipp Hörist pushed to branch master at gajim / gajim
Commits:
e9038f22 by André Apitzsch at 2017-05-16T23:51:12+02:00
Zeroconf: SSL_ERROR_* has been moved to ssl module
fixes #8625
- - - - -
381b9b0a by Philipp Hörist at 2017-05-17T13:21:47+02:00
Merge branch 'SSL_ERROR' into 'master'
Zeroconf: SSL_ERROR_* has been moved to ssl module
Closes #8625
See merge request !100
- - - - -
1 changed file:
- src/common/zeroconf/client_zeroconf.py
Changes:
=====================================
src/common/zeroconf/client_zeroconf.py
=====================================
--- a/src/common/zeroconf/client_zeroconf.py
+++ b/src/common/zeroconf/client_zeroconf.py
@@ -27,6 +27,7 @@ from common.zeroconf import zeroconf
from nbxmpp.protocol import *
import socket
+import ssl
import errno
import sys
import os
@@ -515,14 +516,14 @@ class P2PConnection(IdleObject, PlugIn):
except Exception as e:
errnum = e.errno
# "received" will be empty anyhow
- if errnum == socket.SSL_ERROR_WANT_READ:
+ if errnum == ssl.SSL_ERROR_WANT_READ:
pass
elif errnum in [errno.ECONNRESET, errno.ENOTCONN, errno.ESHUTDOWN]:
self.pollend()
# don't proccess result, cas it will raise error
return
elif not received :
- if errnum != socket.SSL_ERROR_EOF:
+ if errnum != ssl.SSL_ERROR_EOF:
# 8 EOF occurred in violation of protocol
self.pollend()
if self.state >= 0:
@@ -583,7 +584,7 @@ class P2PConnection(IdleObject, PlugIn):
self._on_send()
except socket.error as e:
- if e.errno == socket.SSL_ERROR_WANT_WRITE:
+ if e.errno == ssl.SSL_ERROR_WANT_WRITE:
return True
if self.state < 0:
self.disconnect()
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/a0a27d9cb259f5e1515e1cf51050dfec68d722dc...381b9b0a6c1daae6c8cc04ab25fecc10eeb322dd
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
