summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2013-09-12 18:23:48 +0100
committerAsk Solem <ask@celeryproject.org>2013-09-12 18:23:48 +0100
commit0581241eba87900bc95d60b3df575b3331a273cc (patch)
tree3ba69962706c8d63f05c412292dced6a4a335b93
parent045205d435e560d9bdba2d4cf6a1b40d78760b38 (diff)
parent3f7d3995b87670127eefcc99bd9e30e8902d801e (diff)
downloadkombu-0581241eba87900bc95d60b3df575b3331a273cc.tar.gz
Merge branch 'master' of github.com:celery/kombu
-rw-r--r--kombu/connection.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/kombu/connection.py b/kombu/connection.py
index 74a5b4a4..54e0afff 100644
--- a/kombu/connection.py
+++ b/kombu/connection.py
@@ -599,8 +599,9 @@ class Connection(object):
password = fields['password']
transport = fields['transport']
url = '%s://' % transport
- if userid:
- url += quoteS(userid)
+ if userid or password:
+ if userid:
+ url += quoteS(userid)
if include_password and password:
url += ':' + quoteS(password)
url += '@'