summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Richter <stephan.richter@gmail.com>2018-11-29 06:19:18 -0500
committerChris Dent <chris.dent@gmail.com>2018-11-29 11:19:18 +0000
commit78dd2ec0138467305f1686558fca4ff8ca0b2b70 (patch)
tree714f0ae9edead6c4628137e938682ce1d1d8d808
parent76cec509469670956933cd78e7193f5349eef1f3 (diff)
downloadpaste-git-78dd2ec0138467305f1686558fca4ff8ca0b2b70.tar.gz
Remove use of OpenSSL.tsafe, which links to OpenSSL.SSL anyways. (#16)
-rwxr-xr-xpaste/httpserver.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/paste/httpserver.py b/paste/httpserver.py
index 963285e..803fbe1 100755
--- a/paste/httpserver.py
+++ b/paste/httpserver.py
@@ -331,7 +331,7 @@ class WSGIHandlerMixin:
# http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/442473
#
try:
- from OpenSSL import SSL, tsafe
+ from OpenSSL import SSL
SocketErrors = (socket.error, SSL.ZeroReturnError, SSL.SysCallError)
except ImportError:
# Do not require pyOpenSSL to be installed, but disable SSL
@@ -379,7 +379,7 @@ else:
self.socket_type)
self.ssl_context = ssl_context
if ssl_context:
- class TSafeConnection(tsafe.Connection):
+ class SSLConnection(SSL.Connection):
def settimeout(self, *args):
self._lock.acquire()
try:
@@ -392,7 +392,7 @@ else:
return self._ssl_conn.gettimeout()
finally:
self._lock.release()
- self.socket = TSafeConnection(ssl_context, self.socket)
+ self.socket = SSLConnection(ssl_context, self.socket)
self.server_bind()
if request_queue_size:
self.socket.listen(request_queue_size)