fixed ssl close

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@783872 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 16 insertions, 24 deletions

diff --git a/qpid/python/qpid/connection.py b/qpid/python/qpid/connection.py
index f32bb8b428..5abab3802c 100644
--- a/qpid/python/qpid/connection.py
+++ b/qpid/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()
diff --git a/qpid/python/qpid/util.py b/qpid/python/qpid/util.py
index c1ea2d60d6..c46716b88f 100644
--- a/qpid/python/qpid/util.py
+++ b/qpid/python/qpid/util.py
@@ -22,7 +22,21 @@ import os, socket, time, textwrap, re
 try:
   from ssl import wrap_socket as ssl
 except ImportError:
-  from socket import ssl
+  from socket import ssl as wrap_socket
+  class ssl:
+
+    def __init__(self, sock):
+      self.sock = sock
+      self.ssl = wrap_socket(sock)
+
+    def recv(self, n):
+      return self.ssl.read(n)
+
+    def send(self, s):
+      return self.ssl.write(s)
+
+    def close(self):
+      self.sock.close()
 
 def connect(host, port):
   sock = socket.socket()