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

1 files changed, 10 insertions, 5 deletions

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):