diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2013-02-28 16:14:30 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2013-02-28 16:14:30 +0000 |
| commit | 9c73ef7a5ac10acd6a50d5d52bd721fc2faa5919 (patch) | |
| tree | 2a890e1df09e5b896a9b4168a7b22648f559a1f2 /python/qpid/client.py | |
| parent | 172d9b2a16cfb817bbe632d050acba7e31401cd2 (diff) | |
| download | qpid-python-asyncstore.tar.gz | |
Update from trunk r1375509 through r1450773asyncstore
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1451244 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python/qpid/client.py')
| -rw-r--r-- | python/qpid/client.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/python/qpid/client.py b/python/qpid/client.py index 5a877bb8d6..4d42a8b20f 100644 --- a/python/qpid/client.py +++ b/python/qpid/client.py @@ -18,13 +18,14 @@ # """ -An AQMP client implementation that uses a custom delegate for +An AMQP client implementation that uses a custom delegate for interacting with the server. """ import os, threading from peer import Peer, Channel, Closed from delegate import Delegate +from util import get_client_properties_with_defaults from connection08 import Connection, Frame, connect from spec08 import load from queue import Queue @@ -76,12 +77,12 @@ class Client: self.lock.release() return q - def start(self, response, mechanism="AMQPLAIN", locale="en_US", tune_params=None): + def start(self, response, mechanism="AMQPLAIN", locale="en_US", tune_params=None, client_properties=None): self.mechanism = mechanism self.response = response self.locale = locale self.tune_params = tune_params - + self.client_properties=get_client_properties_with_defaults(provided_client_properties=client_properties) self.socket = connect(self.host, self.port) self.conn = Connection(self.socket, self.spec) self.peer = Peer(self.conn, ClientDelegate(self), Session) @@ -128,7 +129,8 @@ class ClientDelegate(Delegate): def connection_start(self, ch, msg): msg.start_ok(mechanism=self.client.mechanism, response=self.client.response, - locale=self.client.locale) + locale=self.client.locale, + client_properties=self.client.client_properties) def connection_tune(self, ch, msg): if self.client.tune_params: |