--- halberd-0.2.4/Halberd/clientlib.py.orig 2010-08-14 15:07:24.000000000 +0200
+++ halberd-0.2.4/Halberd/clientlib.py 2010-08-29 21:17:17.138441225 +0200
@@ -30,6 +30,7 @@
import time
+import ssl
import socket
import urlparse
@@ -310,7 +311,7 @@
self._recv = None
self._sslsock = None
- self._timeout_exceptions.append(socket.sslerror)
+ self._timeout_exceptions.append(ssl.SSLError)
# Path to an SSL key file and certificate.
self.keyfile = None
@@ -327,8 +328,8 @@
"""
HTTPClient._connect(self, addr)
try:
- self._sslsock = socket.ssl(self._sock, self.keyfile, self.certfile)
- except socket.sslerror, msg:
+ self._sslsock = ssl.wrap_socket(self._sock, self.keyfile, self.certfile)
+ except ssl.SSLError, msg:
raise HTTPSError, msg
self._recv = self._sslsock.read