summaryrefslogtreecommitdiff
path: root/python/qpid/connection.py
diff options
context:
space:
mode:
authorRafael H. Schloming <rhs@apache.org>2009-06-11 18:51:31 +0000
committerRafael H. Schloming <rhs@apache.org>2009-06-11 18:51:31 +0000
commite3262dbfc23c53fa4e9c9040ab1077ebb9b621f0 (patch)
treeff33add4aa5e036f534f23cab18ba36adb2d9390 /python/qpid/connection.py
parent03d7dcc8595a1fdcde14d9aa2729651888a3c051 (diff)
downloadqpid-python-e3262dbfc23c53fa4e9c9040ab1077ebb9b621f0.tar.gz
fixed ssl close
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@783872 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python/qpid/connection.py')
-rw-r--r--python/qpid/connection.py24
1 files changed, 1 insertions, 23 deletions
diff --git a/python/qpid/connection.py b/python/qpid/connection.py
index f32bb8b428..5abab3802c 100644
--- a/python/qpid/connection.py
+++ b/python/qpid/connection.py
@@ -43,32 +43,10 @@ def client(*args, **kwargs):
def server(*args, **kwargs):
return delegates.Server(*args, **kwargs)
-class SSLWrapper:
-
- def __init__(self, ssl):
- self.ssl = ssl
-
- def recv(self, n):
- return self.ssl.read(n)
-
- def send(self, s):
- return self.ssl.write(s)
-
-try:
- from socket import SSLType
- def sslwrap(sock):
- if isinstance(sock, SSLType):
- return SSLWrapper(sock)
- else:
- return sock
-except ImportError:
- def sslwrap(sock):
- return sock
-
class Connection(Assembler):
def __init__(self, sock, spec=SPEC, delegate=client, **args):
- Assembler.__init__(self, sslwrap(sock))
+ Assembler.__init__(self, sock)
self.spec = spec
self.lock = RLock()