diff options
author | Alan Conway <aconway@apache.org> | 2012-01-25 18:48:31 +0000 |
---|---|---|
committer | Alan Conway <aconway@apache.org> | 2012-01-25 18:48:31 +0000 |
commit | fe4d3dd164c2685cb7483c65e2e915f93d13e7e6 (patch) | |
tree | 5abc1eb5f6f593fc6eb23cbe176f2701116374ba /qpid/python/qpid/delegates.py | |
parent | 4208d1a90f004a5ab72463e9c6d9f97a3a17d16e (diff) | |
download | qpid-python-fe4d3dd164c2685cb7483c65e2e915f93d13e7e6.tar.gz |
QPID-3603: Set connection.start client-properties argument from python.
The client-properties can be specified for old-API, new-API and
QMF connections.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3603-2@1235869 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/python/qpid/delegates.py')
-rw-r--r-- | qpid/python/qpid/delegates.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qpid/python/qpid/delegates.py b/qpid/python/qpid/delegates.py index 8dbdc37564..685cf49f54 100644 --- a/qpid/python/qpid/delegates.py +++ b/qpid/python/qpid/delegates.py @@ -159,7 +159,8 @@ class Client(Delegate): def __init__(self, connection, username=None, password=None, mechanism=None, heartbeat=None, **kwargs): Delegate.__init__(self, connection) - + self.client_properties=Client.PROPERTIES.copy() + self.client_properties.update(kwargs.get("client_properties",{})) ## ## self.acceptableMechanisms is the list of SASL mechanisms that the client is willing to ## use. If it's None, then any mechanism is acceptable. @@ -215,7 +216,8 @@ class Client(Delegate): mech = "ANONYMOUS" if not mech in mech_list: raise Closed("No acceptable SASL authentication mechanism available") - ch.connection_start_ok(client_properties=Client.PROPERTIES, mechanism=mech, response=initial) + ch.connection_start_ok(client_properties=self.client_properties, + mechanism=mech, response=initial) def connection_secure(self, ch, secure): resp = None |