summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClemens Wolff <clemens@justamouse.com>2019-02-04 02:41:09 -0500
committerOmer Katz <omer.drow@gmail.com>2019-02-04 09:41:09 +0200
commitec05b6eb502305388d4420ae37d473469cbaaff9 (patch)
tree757d6ce6d458d6690627101b23038a3a9b8d0665
parentb4f239cc109897adecd43d876d51737b4e42abe2 (diff)
downloadkombu-ec05b6eb502305388d4420ae37d473469cbaaff9.tar.gz
Fix breaking change in Azure ServiceBus SDK (#998)
See https://github.com/Azure/azure-sdk-for-python/tree/97b71f2670fe3ebffd4c834c8d7681284d02e048/azure-servicebus#migration-from-0211-to-0500
-rw-r--r--kombu/transport/azureservicebus.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/kombu/transport/azureservicebus.py b/kombu/transport/azureservicebus.py
index f022ebb4..3c0c7136 100644
--- a/kombu/transport/azureservicebus.py
+++ b/kombu/transport/azureservicebus.py
@@ -29,9 +29,15 @@ from kombu.utils.objects import cached_property
from . import virtual
try:
+ # azure-servicebus version <= 0.21.1
from azure.servicebus import ServiceBusService, Message, Queue
except ImportError:
- ServiceBusService = Message = Queue = None
+ try:
+ # azure-servicebus version >= 0.50.0
+ from azure.servicebus.control_client import \
+ ServiceBusService, Message, Queue
+ except ImportError:
+ ServiceBusService = Message = Queue = None
# dots are replaced by dash, all other punctuation replaced by underscore.
CHARS_REPLACE_TABLE = {