diff --git a/sdk/servicebus/azure-servicebus/CHANGELOG.md b/sdk/servicebus/azure-servicebus/CHANGELOG.md index 1959018e2b05..523009736af3 100644 --- a/sdk/servicebus/azure-servicebus/CHANGELOG.md +++ b/sdk/servicebus/azure-servicebus/CHANGELOG.md @@ -36,6 +36,7 @@ now raise more concrete exception other than `MessageSettleFailed` and `ServiceB * Exceptions `MessageSendFailed`, `MessageSettleFailed` and `MessageLockExpired` now inherit from `azure.servicebus.exceptions.MessageError`. * `get_state` in `ServiceBusSession` now returns `bytes` instead of a `string`. +* `encoding` support is removed from `ServiceBusMessage` **BugFixes** diff --git a/sdk/servicebus/azure-servicebus/azure/servicebus/_common/message.py b/sdk/servicebus/azure-servicebus/azure/servicebus/_common/message.py index d2bda10f629e..462cf27380b5 100644 --- a/sdk/servicebus/azure-servicebus/azure/servicebus/_common/message.py +++ b/sdk/servicebus/azure-servicebus/azure/servicebus/_common/message.py @@ -85,7 +85,6 @@ class ServiceBusMessage(object): # pylint: disable=too-many-public-methods,too- :keyword str to: The `to` address used for auto_forward chaining scenarios. :keyword str reply_to: The address of an entity to send replies to. :keyword str reply_to_session_id: The session identifier augmenting the `reply_to` address. - :keyword str encoding: The encoding for string data. Default is UTF-8. :ivar AMQPMessage amqp_message: Advanced use only. The internal AMQP message payload that is sent or received. diff --git a/sdk/servicebus/azure-servicebus/azure/servicebus/_servicebus_receiver.py b/sdk/servicebus/azure-servicebus/azure/servicebus/_servicebus_receiver.py index 3a6ad3500e5b..f9461524179b 100644 --- a/sdk/servicebus/azure-servicebus/azure/servicebus/_servicebus_receiver.py +++ b/sdk/servicebus/azure-servicebus/azure/servicebus/_servicebus_receiver.py @@ -132,7 +132,7 @@ def __init__( ) self._populate_attributes(**kwargs) - self._session = ServiceBusSession(self._session_id, self, self._config.encoding) if self._session_id else None + self._session = ServiceBusSession(self._session_id, self) if self._session_id else None def __iter__(self): return self._iter_contextual_wrapper() diff --git a/sdk/servicebus/azure-servicebus/azure/servicebus/_servicebus_session.py b/sdk/servicebus/azure-servicebus/azure/servicebus/_servicebus_session.py index 9eeb1936dc70..805dab03ff91 100644 --- a/sdk/servicebus/azure-servicebus/azure/servicebus/_servicebus_session.py +++ b/sdk/servicebus/azure-servicebus/azure/servicebus/_servicebus_session.py @@ -28,11 +28,11 @@ class BaseSession(object): - def __init__(self, session_id, receiver, encoding="UTF-8"): - # type: (str, Union[ServiceBusReceiver, ServiceBusReceiverAsync], str) -> None + def __init__(self, session_id, receiver): + # type: (str, Union[ServiceBusReceiver, ServiceBusReceiverAsync]) -> None self._session_id = session_id self._receiver = receiver - self._encoding = encoding + self._encoding = "UTF-8" self._session_start = None self._locked_until_utc = None # type: Optional[datetime.datetime] self.auto_renew_error = None diff --git a/sdk/servicebus/azure-servicebus/azure/servicebus/aio/_servicebus_receiver_async.py b/sdk/servicebus/azure-servicebus/azure/servicebus/aio/_servicebus_receiver_async.py index c184db107d26..a47f7bf970bc 100644 --- a/sdk/servicebus/azure-servicebus/azure/servicebus/aio/_servicebus_receiver_async.py +++ b/sdk/servicebus/azure-servicebus/azure/servicebus/aio/_servicebus_receiver_async.py @@ -133,7 +133,7 @@ def __init__( ) self._populate_attributes(**kwargs) - self._session = ServiceBusSession(self._session_id, self, self._config.encoding) if self._session_id else None + self._session = ServiceBusSession(self._session_id, self) if self._session_id else None # Python 3.5 does not allow for yielding from a coroutine, so instead of the try-finally functional wrapper # trick to restore the timeout, let's use a wrapper class to maintain the override that may be specified.