Author: rhs Date: Tue May 12 21:36:14 2009 New Revision: 774100 URL: http://svn.apache.org/viewvc?rev=774100&view=rev Log: updated imports to work on python 2.6
Modified: qpid/trunk/qpid/python/qpid/connection.py qpid/trunk/qpid/python/qpid/message.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=774100&r1=774099&r2=774100&view=diff ============================================================================== --- qpid/trunk/qpid/python/qpid/connection.py (original) +++ qpid/trunk/qpid/python/qpid/connection.py Tue May 12 21:36:14 2009 @@ -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 @@ 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): Modified: qpid/trunk/qpid/python/qpid/message.py URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/message.py?rev=774100&r1=774099&r2=774100&view=diff ============================================================================== --- qpid/trunk/qpid/python/qpid/message.py (original) +++ qpid/trunk/qpid/python/qpid/message.py Tue May 12 21:36:14 2009 @@ -17,7 +17,6 @@ # under the License. # from connection08 import Method, Request -from sets import Set class Message: Modified: qpid/trunk/qpid/python/qpid/util.py URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/util.py?rev=774100&r1=774099&r2=774100&view=diff ============================================================================== --- qpid/trunk/qpid/python/qpid/util.py (original) +++ qpid/trunk/qpid/python/qpid/util.py Tue May 12 21:36:14 2009 @@ -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() --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org