diff options
| author | Zhongyue Luo <zhongyue.nah@intel.com> | 2012-09-11 14:03:47 +0800 |
|---|---|---|
| committer | Zhongyue Luo <zhongyue.nah@intel.com> | 2012-09-13 06:07:49 +0800 |
| commit | 2265258dad5c6a1e535336867d9cea5c7a2355d3 (patch) | |
| tree | 1c36cf2838abbfb6e9d73f77f5c509d3fdc093df /openstack/common/rpc/impl_kombu.py | |
| parent | ccaaa26dd3afa62599ea3b476e2a5d1af7e075ef (diff) | |
| download | oslo-2265258dad5c6a1e535336867d9cea5c7a2355d3.tar.gz oslo-2265258dad5c6a1e535336867d9cea5c7a2355d3.tar.xz oslo-2265258dad5c6a1e535336867d9cea5c7a2355d3.zip | |
Use pep8 v1.3.3
Fixed indents which violate pep8 1.3.3
Also added .mailmap file to coalesce commits
Change-Id: Ia7a788a28e6c0fd9cb52fb7ea477cddd7d589e58
Diffstat (limited to 'openstack/common/rpc/impl_kombu.py')
| -rw-r--r-- | openstack/common/rpc/impl_kombu.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/openstack/common/rpc/impl_kombu.py b/openstack/common/rpc/impl_kombu.py index 294fc0a..8617bfc 100644 --- a/openstack/common/rpc/impl_kombu.py +++ b/openstack/common/rpc/impl_kombu.py @@ -210,10 +210,11 @@ class TopicConsumer(ConsumerBase): 'auto_delete': False, 'exclusive': False} options.update(kwargs) - exchange = kombu.entity.Exchange( - name=rpc_amqp.get_control_exchange(conf), - type='topic', durable=options['durable'], - auto_delete=options['auto_delete']) + exchange_name = rpc_amqp.get_control_exchange(conf) + exchange = kombu.entity.Exchange(name=exchange_name, + type='topic', + durable=options['durable'], + auto_delete=options['auto_delete']) super(TopicConsumer, self).__init__(channel, callback, tag, @@ -307,9 +308,12 @@ class TopicPublisher(Publisher): 'auto_delete': False, 'exclusive': False} options.update(kwargs) + exchange_name = rpc_amqp.get_control_exchange(conf) super(TopicPublisher, self).__init__(channel, - rpc_amqp.get_control_exchange(conf), topic, - type='topic', **options) + exchange_name, + topic, + type='topic', + **options) class FanoutPublisher(Publisher): |