You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2009/06/11 20:51:31 UTC
svn commit: r783872 - in /qpid/trunk/qpid/python/qpid: connection.py util.py
Author: rhs
Date: Thu Jun 11 18:51:31 2009
New Revision: 783872
URL: http://svn.apache.org/viewvc?rev=783872&view=rev
Log:
fixed ssl close
Modified:
qpid/trunk/qpid/python/qpid/connection.py
qpid/trunk/qpid/python/qpid/util.py
Modified: qpid/trunk/qpid/python/qpid/connection.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/connection.py?rev=783872&r1=783871&r2=783872&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/connection.py (original)
+++ qpid/trunk/qpid/python/qpid/connection.py Thu Jun 11 18:51:31 2009
@@ -43,32 +43,10 @@
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()
Modified: qpid/trunk/qpid/python/qpid/util.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/util.py?rev=783872&r1=783871&r2=783872&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/util.py (original)
+++ qpid/trunk/qpid/python/qpid/util.py Thu Jun 11 18:51:31 2009
@@ -22,7 +22,21 @@
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()
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org