summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2012-06-24 17:13:50 +0100
committerAsk Solem <ask@celeryproject.org>2012-06-24 17:13:50 +0100
commit8e9514934bfd6c0d97da4ff2dafe3ac6f2b6948b (patch)
tree5c23b9208ebc9aff8a1de56c4a360f81a9e3007b
parent513d04b235a2129316ca40f38e759ebec6ffe33b (diff)
downloadkombu-8e9514934bfd6c0d97da4ff2dafe3ac6f2b6948b.tar.gz
Recent commit broke Connection URL parsingv2.2.3
-rw-r--r--kombu/common.py3
-rw-r--r--kombu/connection.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/kombu/common.py b/kombu/common.py
index 42bf0a67..1aaf17bf 100644
--- a/kombu/common.py
+++ b/kombu/common.py
@@ -170,7 +170,8 @@ def collect_replies(conn, channel, queue, *args, **kwargs):
no_ack = kwargs.setdefault('no_ack', True)
received = False
try:
- for body, message in itermessages(conn, channel, queue, *args, **kwargs):
+ for body, message in itermessages(conn, channel, queue,
+ *args, **kwargs):
if not no_ack:
message.ack()
received = True
diff --git a/kombu/connection.py b/kombu/connection.py
index ff049c81..5c272ddf 100644
--- a/kombu/connection.py
+++ b/kombu/connection.py
@@ -107,7 +107,7 @@ class Connection(object):
params['transport'], params['hostname'] = hostname.split('+')
self.uri_prefix = params['transport']
else:
- if transport and transport not in URI_PASSTHROUGH:
+ if transport not in URI_PASSTHROUGH:
params.update(parse_url(hostname))
self._init_params(**params)