[SB] mypy + pylint fixes (#35310)

* pylint fixes

* typo+mypy

* line too long

Author: l0lawrence

sdk/servicebus/azure-servicebus/azure/servicebus/_base_handler.py

@@ -385,7 +385,7 @@ def _check_live(self):
         except AttributeError:
             pass
 
-    def _do_retryable_operation(
+    def _do_retryable_operation( # pylint: disable=inconsistent-return-statements
         self,
         operation: Callable,
         timeout: Optional[float] = None,
@@ -496,13 +496,15 @@ def _mgmt_request_response(
          be service-specific, but common values include READ, CREATE and UPDATE.
          This value will be added as an application property on the message.
         :param message: The message to send in the management request.
-        :paramtype message: Any
+        :type message: Any
         :param callback: The callback which is used to parse the returning message.
-        :paramtype callback: Callable[int, Union[~uamqp.message.Message, Message], str]
-        :param keep_alive_associated_link: A boolean flag for keeping associated amqp sender/receiver link alive when
+        :type callback: Callable[int, Union[~uamqp.message.Message, Message], str]
+        :param bool keep_alive_associated_link: A boolean flag for keeping
+         associated amqp sender/receiver link alive when
          executing operation on mgmt links.
-        :param timeout: timeout in seconds executing the mgmt operation.
-        :rtype: Tuple
+        :param float or None timeout: timeout in seconds executing the mgmt operation.
+        :return: The message response.
+        :rtype: Message
         """
         self._open()
         application_properties = {}

sdk/servicebus/azure-servicebus/azure/servicebus/_common/tracing.py

@@ -241,7 +241,7 @@ def trace_message(
     return message
 
 
-def get_receive_links(messages: Union[ReceiveMessageTypes, Iterable[ReceiveMessageTypes]]) -> List[Link]:
+def get_receive_links(messages: Union[ServiceBusReceivedMessage, Iterable[ServiceBusReceivedMessage]]) -> List[Link]:
     if not is_tracing_enabled():
         return []
 
@@ -268,7 +268,8 @@ def get_receive_links(messages: Union[ReceiveMessageTypes, Iterable[ReceiveMessa
                 if tracestate:
                     headers["tracestate"] = cast(str, tracestate)
 
-            enqueued_time = message.raw_amqp_message.annotations.get(TRACE_ENQUEUED_TIME_PROPERTY)
+            enqueued_time = message.raw_amqp_message.annotations.get(TRACE_ENQUEUED_TIME_PROPERTY) \
+                if message.raw_amqp_message.annotations else None
             attributes = {SPAN_ENQUEUED_TIME_PROPERTY: enqueued_time} if enqueued_time else None
             links.append(Link(headers, attributes=attributes))
     except AttributeError:

sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/aio/_client_async.py

@@ -844,6 +844,8 @@ async def receive_message_batch_async(self, **kwargs):
          0, the client will continue to wait until at least one message is received. The
          default is 0.
         :paramtype timeout: float
+        :return: Retryable operation coroutine.
+        :rtype: Coroutine[Any, Any, Any]
         """
         return await self._do_retryable_operation_async(
             self._receive_message_batch_impl_async,

sdk/servicebus/azure-servicebus/azure/servicebus/_servicebus_client.py

@@ -236,6 +236,7 @@ def from_connection_string(
         :keyword uamqp_transport: Whether to use the `uamqp` library as the underlying transport. The default value is
          False and the Pure Python AMQP library will be used as the underlying transport.
         :paramtype uamqp_transport: bool
+        :returns: The ServiceBusClient instance.
         :rtype: ~azure.servicebus.ServiceBusClient
 
         .. admonition:: Example:
@@ -383,6 +384,7 @@ def get_queue_receiver(
          wait when sending and receiving data before timing out. The default value is 0.2 for TransportType.Amqp
          and 1 for TransportType.AmqpOverWebsocket. If connection errors are occurring due to write timing out,
          a larger than default value may need to be passed in.
+        :returns: The ServiceBusReceiver for the queue.
         :rtype: ~azure.servicebus.ServiceBusReceiver
 
         .. admonition:: Example:

sdk/servicebus/azure-servicebus/azure/servicebus/_servicebus_receiver.py

@@ -325,6 +325,7 @@ def _from_connection_string(
          the in-memory prefetch buffer until they're received into the application. If the application ends before
          the messages are received into the application, those messages will be lost and unable to be recovered.
          Therefore, it's recommended that PEEK_LOCK mode be used with prefetch.
+        :returns: The ServiceBusReceiver.
         :rtype: ~azure.servicebus.ServiceBusReceiver
 
         :raises ~azure.servicebus.ServiceBusAuthenticationError: Indicates an issue in token/identity validity.

sdk/servicebus/azure-servicebus/azure/servicebus/_servicebus_sender.py

@@ -231,7 +231,7 @@ def _from_connection_string(cls, conn_str: str, **kwargs: Any) -> "ServiceBusSen
          keys: `'proxy_hostname'` (str value) and `'proxy_port'` (int value).
          Additionally the following keys may also be present: `'username', 'password'`.
         :keyword str user_agent: If specified, this will be added in front of the built-in user agent string.
-
+        :returns: The ServiceBusSender.
         :rtype: ~azure.servicebus.ServiceBusSender
 
         :raises ~azure.servicebus.ServiceBusAuthenticationError: Indicates an issue in token/identity validity.

sdk/servicebus/azure-servicebus/azure/servicebus/_transport/_base.py

@@ -342,7 +342,7 @@ def create_mgmt_msg(
     ):
         """
         :param message: The message to send in the management request.
-        :paramtype message: Any
+        :type message: Any
         :param Dict[bytes, str] application_properties: App props.
         :param ~azure.servicebus._common._configuration.Configuration config: Configuration.
         :param str reply_to: Reply to.

sdk/servicebus/azure-servicebus/azure/servicebus/_transport/_pyamqp_transport.py

@@ -903,10 +903,11 @@ def create_mgmt_msg(
     ) -> "Message": # pylint:disable=unused-argument
         """
         :param message: The message to send in the management request.
-        :paramtype message: Any
+        :type message: Any
         :param dict[bytes, str] application_properties: App props.
         :param ~azure.servicebus._common._configuration.Configuration config: Configuration.
         :param str reply_to: Reply to.
+        :return: The message to send in the management request.
         :rtype: ~pyamqp.message.Message
         """
         return Message(

sdk/servicebus/azure-servicebus/azure/servicebus/_transport/_uamqp_transport.py

@@ -605,10 +605,11 @@ def send_messages(
             :param ~azure.servicebus.ServiceBusSender sender: The sender with handler
              to send messages.
             :param message: ServiceBusMessage with uamqp.Message to be sent.
-            :paramtype message: ~azure.servicebus.ServiceBusMessage or ~azure.servicebus.ServiceBusMessageBatch
+            :type message: ~azure.servicebus.ServiceBusMessage or ~azure.servicebus.ServiceBusMessageBatch
             :param int timeout: Timeout time.
-            :param last_exception: Exception to raise if message timed out. Only used by uamqp transport.
-            :param logger: Logger.
+            :param Exception or None last_exception: Exception to raise if message timed out.
+             Only used by uamqp transport.
+            :param Logger logger: Logger.
             """
             # pylint: disable=protected-access
             sender._open()
@@ -972,10 +973,11 @@ def create_mgmt_msg(
         ) -> "Message":
             """
             :param message: The message to send in the management request.
-            :paramtype message: Any
+            :type message: Any
             :param Dict[bytes, str] application_properties: App props.
             :param ~azure.servicebus._common._configuration.Configuration config: Configuration.
             :param str reply_to: Reply to.
+            :return: The message to send in the management request.
             :rtype: uamqp.Message
             """
             return Message(  # type: ignore # TODO: fix mypy error

sdk/servicebus/azure-servicebus/azure/servicebus/aio/_base_handler_async.py

@@ -340,13 +340,15 @@ async def _mgmt_request_response(
          be service-specific, but common values include READ, CREATE and UPDATE.
          This value will be added as an application property on the message.
         :param message: The message to send in the management request.
-        :paramtype message: ~uamqp.message.Message
+        :type message: ~uamqp.message.Message
         :param callback: The callback which is used to parse the returning message.
-        :paramtype callback: Callable[int, ~uamqp.message.Message, str]
-        :param keep_alive_associated_link: A boolean flag for keeping associated amqp sender/receiver link alive when
+        :type callback: Callable[int, ~uamqp.message.Message, str]
+        :param bool keep_alive_associated_link: A boolean flag for keeping
+         associated amqp sender/receiver link alive when
          executing operation on mgmt links.
-        :param timeout: timeout in seconds for executing the mgmt operation.
-        :rtype: None
+        :param float or None timeout: timeout in seconds for executing the mgmt operation.
+        :return: The message response.
+        :rtype: Message
         """
         await self._open()