summaryrefslogtreecommitdiff
path: root/python/qpid/util.py
diff options
context:
space:
mode:
authorRafael H. Schloming <rhs@apache.org>2009-05-12 21:36:14 +0000
committerRafael H. Schloming <rhs@apache.org>2009-05-12 21:36:14 +0000
commitc39958434384e2833ec2f9e9139010ba28ae02dd (patch)
treea2550b9e6e5e8a5153404c286b83540af61204bc /python/qpid/util.py
parenteae3947ff54bfe2d7a0fa70cea02c4194f50ccf4 (diff)
downloadqpid-python-c39958434384e2833ec2f9e9139010ba28ae02dd.tar.gz
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
Diffstat (limited to 'python/qpid/util.py')
-rw-r--r--python/qpid/util.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/python/qpid/util.py b/python/qpid/util.py
index f4b613f4e5..c1ea2d60d6 100644
--- a/python/qpid/util.py
+++ b/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()