diff options
author | Ask Solem <ask@celeryproject.org> | 2014-02-10 16:28:15 +0000 |
---|---|---|
committer | Ask Solem <ask@celeryproject.org> | 2014-02-10 16:28:15 +0000 |
commit | 7f60c887ba7bfe460b44f9342604b80a215e01a0 (patch) | |
tree | 5a2e51b533e83d04666b57327725194d4fea9847 /kombu/transport/SLMQ.py | |
parent | 3cb79f9c8c4db3c47c66b5419fd7a40d09758b87 (diff) | |
download | kombu-7f60c887ba7bfe460b44f9342604b80a215e01a0.tar.gz |
quotes
Diffstat (limited to 'kombu/transport/SLMQ.py')
-rw-r--r-- | kombu/transport/SLMQ.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/kombu/transport/SLMQ.py b/kombu/transport/SLMQ.py index d6589f66..449bc2fb 100644 --- a/kombu/transport/SLMQ.py +++ b/kombu/transport/SLMQ.py @@ -145,13 +145,12 @@ class Channel(virtual.Channel): host = os.environ.get('SLMQ_HOST', conninfo.hostname) port = os.environ.get('SLMQ_PORT', conninfo.port) secure = bool(os.environ.get( - 'SLMQ_SECURE', self.transport_options.get('secure')) or True) - if secure: - endpoint = "https://%s" % host - else: - endpoint = "http://%s" % host - if port: - endpoint = "%s:%s" % (endpoint, port) + 'SLMQ_SECURE', self.transport_options.get('secure')) or True, + ) + endpoint = '{0}://{1}{2}'.format( + 'https' if secure else 'http', host, + ':{0}'.format(port) if port else '', + ) self._slmq = get_client(account, endpoint=endpoint) self._slmq.authenticate(user, api_key) |