summaryrefslogtreecommitdiff
path: root/python/qpid
diff options
context:
space:
mode:
authorKim van der Riet <kpvdr@apache.org>2012-08-27 15:40:33 +0000
committerKim van der Riet <kpvdr@apache.org>2012-08-27 15:40:33 +0000
commit868ce7469262d6fd2fe3f2e7f04cfe7af654d59f (patch)
tree63e6b5e62554609beb21e8c8d0610569f36d2743 /python/qpid
parent2e5ff8f1b328831043e6d7e323249d62187234c6 (diff)
downloadqpid-python-868ce7469262d6fd2fe3f2e7f04cfe7af654d59f.tar.gz
QPID-3858: Updated code to include recent refactoring by Gordon (gsim) - see QPID-4178.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1377715 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python/qpid')
-rw-r--r--python/qpid/util.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/qpid/util.py b/python/qpid/util.py
index 7541595453..39ad1d830e 100644
--- a/python/qpid/util.py
+++ b/python/qpid/util.py
@@ -27,7 +27,7 @@ except ImportError:
def __init__(self, sock, keyfile=None, certfile=None, trustfile=None):
self.sock = sock
- self.ssl = wrap_socket(sock, keyfile=keyfile, certfile=certfile, ca_certs=trustfile)
+ self.ssl = wrap_socket(sock, keyfile=keyfile, certfile=certfile)
def recv(self, n):
return self.ssl.read(n)