From 2da4527cd64278f9ae71d3009240b2b600db786c Mon Sep 17 00:00:00 2001 From: Kieran Brantner-Magee Date: Wed, 9 Sep 2020 18:22:04 -0700 Subject: [PATCH] Small set of non-blocking changes from b6. - adds EOF whitespace - renames _id to _session_id - Adjusts docstring type Closes #13686 --- .../azure/servicebus/_servicebus_session.py | 10 +++++----- .../azure/servicebus/aio/_servicebus_session_async.py | 6 +++--- .../aio/management/_management_client_async.py | 2 +- .../mgmt_tests/test_mgmt_namespaces_async.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sdk/servicebus/azure-servicebus/azure/servicebus/_servicebus_session.py b/sdk/servicebus/azure-servicebus/azure/servicebus/_servicebus_session.py index 76a1e0948062..a5387a293418 100644 --- a/sdk/servicebus/azure-servicebus/azure/servicebus/_servicebus_session.py +++ b/sdk/servicebus/azure-servicebus/azure/servicebus/_servicebus_session.py @@ -30,7 +30,7 @@ class BaseSession(object): def __init__(self, session_id, receiver, encoding="UTF-8"): # type: (str, Union[ServiceBusSessionReceiver, ServiceBusSessionReceiverAsync], str) -> None - self._id = session_id + self._session_id = session_id self._receiver = receiver self._encoding = encoding self._session_start = None @@ -58,7 +58,7 @@ def session_id(self): :rtype: str """ - return self._id + return self._session_id @property def locked_until_utc(self): @@ -110,7 +110,7 @@ def get_state(self): self._check_live() response = self._receiver._mgmt_request_response_with_retry( # pylint: disable=protected-access REQUEST_RESPONSE_GET_SESSION_STATE_OPERATION, - {MGMT_REQUEST_SESSION_ID: self._id}, + {MGMT_REQUEST_SESSION_ID: self._session_id}, mgmt_handlers.default ) session_state = response.get(MGMT_RESPONSE_SESSION_STATE) @@ -138,7 +138,7 @@ def set_state(self, state): state = state.encode(self._encoding) if isinstance(state, six.text_type) else state return self._receiver._mgmt_request_response_with_retry( # pylint: disable=protected-access REQUEST_RESPONSE_SET_SESSION_STATE_OPERATION, - {MGMT_REQUEST_SESSION_ID: self._id, MGMT_REQUEST_SESSION_STATE: bytearray(state)}, + {MGMT_REQUEST_SESSION_ID: self._session_id, MGMT_REQUEST_SESSION_STATE: bytearray(state)}, mgmt_handlers.default ) @@ -169,7 +169,7 @@ def renew_lock(self): self._check_live() expiry = self._receiver._mgmt_request_response_with_retry( # pylint: disable=protected-access REQUEST_RESPONSE_RENEW_SESSION_LOCK_OPERATION, - {MGMT_REQUEST_SESSION_ID: self._id}, + {MGMT_REQUEST_SESSION_ID: self._session_id}, mgmt_handlers.default ) expiry_timestamp = expiry[MGMT_RESPONSE_RECEIVER_EXPIRATION]/1000.0 diff --git a/sdk/servicebus/azure-servicebus/azure/servicebus/aio/_servicebus_session_async.py b/sdk/servicebus/azure-servicebus/azure/servicebus/aio/_servicebus_session_async.py index 61a0f3035723..c4bca78bd16d 100644 --- a/sdk/servicebus/azure-servicebus/azure/servicebus/aio/_servicebus_session_async.py +++ b/sdk/servicebus/azure-servicebus/azure/servicebus/aio/_servicebus_session_async.py @@ -60,7 +60,7 @@ async def get_state(self): self._check_live() response = await self._receiver._mgmt_request_response_with_retry( # pylint: disable=protected-access REQUEST_RESPONSE_GET_SESSION_STATE_OPERATION, - {MGMT_REQUEST_SESSION_ID: self._id}, + {MGMT_REQUEST_SESSION_ID: self._session_id}, mgmt_handlers.default ) session_state = response.get(MGMT_RESPONSE_SESSION_STATE) @@ -89,7 +89,7 @@ async def set_state(self, state): state = state.encode(self._encoding) if isinstance(state, six.text_type) else state return await self._receiver._mgmt_request_response_with_retry( # pylint: disable=protected-access REQUEST_RESPONSE_SET_SESSION_STATE_OPERATION, - {MGMT_REQUEST_SESSION_ID: self._id, MGMT_REQUEST_SESSION_STATE: bytearray(state)}, + {MGMT_REQUEST_SESSION_ID: self._session_id, MGMT_REQUEST_SESSION_STATE: bytearray(state)}, mgmt_handlers.default ) @@ -120,7 +120,7 @@ async def renew_lock(self): self._check_live() expiry = await self._receiver._mgmt_request_response_with_retry( # pylint: disable=protected-access REQUEST_RESPONSE_RENEW_SESSION_LOCK_OPERATION, - {MGMT_REQUEST_SESSION_ID: self._id}, + {MGMT_REQUEST_SESSION_ID: self._session_id}, mgmt_handlers.default ) expiry_timestamp = expiry[MGMT_RESPONSE_RECEIVER_EXPIRATION]/1000.0 diff --git a/sdk/servicebus/azure-servicebus/azure/servicebus/aio/management/_management_client_async.py b/sdk/servicebus/azure-servicebus/azure/servicebus/aio/management/_management_client_async.py index e495126304a1..b2ba3d0f0221 100644 --- a/sdk/servicebus/azure-servicebus/azure/servicebus/aio/management/_management_client_async.py +++ b/sdk/servicebus/azure-servicebus/azure/servicebus/aio/management/_management_client_async.py @@ -53,7 +53,7 @@ class ServiceBusAdministrationClient: #pylint:disable=too-many-public-methods def __init__( self, fully_qualified_namespace: str, - credential: Union["AsyncTokenCredential", ServiceBusSharedKeyCredential], + credential: "AsyncTokenCredential", **kwargs) -> None: self.fully_qualified_namespace = fully_qualified_namespace diff --git a/sdk/servicebus/azure-servicebus/tests/async_tests/mgmt_tests/test_mgmt_namespaces_async.py b/sdk/servicebus/azure-servicebus/tests/async_tests/mgmt_tests/test_mgmt_namespaces_async.py index db75f0ace06f..77e82602f3a5 100644 --- a/sdk/servicebus/azure-servicebus/tests/async_tests/mgmt_tests/test_mgmt_namespaces_async.py +++ b/sdk/servicebus/azure-servicebus/tests/async_tests/mgmt_tests/test_mgmt_namespaces_async.py @@ -22,4 +22,4 @@ async def test_async_mgmt_namespace_get_properties(self, servicebus_namespace_co assert properties assert properties.messaging_sku == 'Standard' # assert properties.name == servicebus_namespace.name - # This is disabled pending investigation of why it isn't getting scrubbed despite expected scrubber use. \ No newline at end of file + # This is disabled pending investigation of why it isn't getting scrubbed despite expected scrubber use.