diff options
| author | Ask Solem <ask@celeryproject.org> | 2012-08-17 19:26:57 +0100 |
|---|---|---|
| committer | Ask Solem <ask@celeryproject.org> | 2012-08-17 19:26:57 +0100 |
| commit | 5e75028cedf563fee44eee0d7e5219ed7ea02178 (patch) | |
| tree | 6248ff22db6c8b65fb0699fce361b6fbc25bb7cd | |
| parent | bffe16dea56c0d7a5b670c515d3eb42633754a9c (diff) | |
| parent | a34851089716744a9e8b252ff0068bc272a77b30 (diff) | |
| download | kombu-5e75028cedf563fee44eee0d7e5219ed7ea02178.tar.gz | |
Merge branch 'master' of github.com:celery/kombu
| -rw-r--r-- | kombu/transport/pika2.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kombu/transport/pika2.py b/kombu/transport/pika2.py index bf1ab721..aa5ed029 100644 --- a/kombu/transport/pika2.py +++ b/kombu/transport/pika2.py @@ -67,8 +67,8 @@ class Channel(blocking.BlockingChannel, base.StdChannel): return None, method, method._properties, method._body def queue_purge(self, queue=None, nowait=False): - return super(Channel, self).queue_purge(queue=queue, - nowait=nowait).message_count + return super(Channel, self).\ + queue_purge(queue=queue, nowait=nowait).method.message_count def basic_publish(self, message, exchange, routing_key, mandatory=False, immediate=False): @@ -103,8 +103,7 @@ class Channel(blocking.BlockingChannel, base.StdChannel): properties = spec.BasicProperties(priority=priority, content_type=content_type, content_encoding=content_encoding, - headers=headers, - **properties) + headers=headers) return body, properties def message_to_python(self, raw_message): |