From c39958434384e2833ec2f9e9139010ba28ae02dd Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Tue, 12 May 2009 21:36:14 +0000 Subject: updated imports to work on python 2.6 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@774100 13f79535-47bb-0310-9956-ffa450edef68 --- python/qpid/connection.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'python/qpid/connection.py') diff --git a/python/qpid/connection.py b/python/qpid/connection.py index d4c5755219..f32bb8b428 100644 --- a/python/qpid/connection.py +++ b/python/qpid/connection.py @@ -17,7 +17,7 @@ # under the License. # -import datatypes, session, socket +import datatypes, session from threading import Thread, Condition, RLock from util import wait, notify from assembler import Assembler, Segment @@ -54,10 +54,15 @@ class SSLWrapper: def send(self, s): return self.ssl.write(s) -def sslwrap(sock): - if isinstance(sock, socket.SSLType): - return SSLWrapper(sock) - else: +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): -- cgit v1.2.1