From 3e799ee8c0ecc4423da43969f6b520a8eee5d98b 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@774100 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/python/qpid/connection.py | 15 ++++++++++----- qpid/python/qpid/message.py | 1 - qpid/python/qpid/util.py | 5 ++++- 3 files changed, 14 insertions(+), 7 deletions(-) (limited to 'qpid/python') diff --git a/qpid/python/qpid/connection.py b/qpid/python/qpid/connection.py index d4c5755219..f32bb8b428 100644 --- a/qpid/python/qpid/connection.py +++ b/qpid/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): diff --git a/qpid/python/qpid/message.py b/qpid/python/qpid/message.py index eb3ef5c03c..4d31da2846 100644 --- a/qpid/python/qpid/message.py +++ b/qpid/python/qpid/message.py @@ -17,7 +17,6 @@ # under the License. # from connection08 import Method, Request -from sets import Set class Message: diff --git a/qpid/python/qpid/util.py b/qpid/python/qpid/util.py index f4b613f4e5..c1ea2d60d6 100644 --- a/qpid/python/qpid/util.py +++ b/qpid/python/qpid/util.py @@ -19,7 +19,10 @@ import os, socket, time, textwrap, re -ssl = socket.ssl +try: + from ssl import wrap_socket as ssl +except ImportError: + from socket import ssl def connect(host, port): sock = socket.socket() -- cgit v1.2.1