next-pylint azure-core / corehttp (#35216)

* next-pylint azure-core

* next-pylint corehttp

* fix mypy

* apply azure-core change to corehttp

Author: kristapratico

sdk/core/azure-core/azure/core/pipeline/_base.py

@@ -87,8 +87,7 @@ def send(self, request: PipelineRequest[HTTPRequestType]) -> PipelineResponse[HT
         except Exception:  # pylint: disable=broad-except
             _await_result(self._policy.on_exception, request)
             raise
-        else:
-            _await_result(self._policy.on_response, request, response)
+        _await_result(self._policy.on_response, request, response)
         return response
 
 

sdk/core/azure-core/azure/core/pipeline/_base_async.py

@@ -70,8 +70,7 @@ async def send(
         except Exception:  # pylint: disable=broad-except
             await _await_result(self._policy.on_exception, request)
             raise
-        else:
-            await _await_result(self._policy.on_response, request, response)
+        await _await_result(self._policy.on_response, request, response)
         return response
 
 

sdk/core/azure-core/azure/core/pipeline/policies/_authentication.py

@@ -124,26 +124,26 @@ def send(self, request: PipelineRequest[HTTPRequestType]) -> PipelineResponse[HT
         self.on_request(request)
         try:
             response = self.next.send(request)
-            self.on_response(request, response)
         except Exception:  # pylint:disable=broad-except
             self.on_exception(request)
             raise
-        else:
-            if response.http_response.status_code == 401:
-                self._token = None  # any cached token is invalid
-                if "WWW-Authenticate" in response.http_response.headers:
-                    request_authorized = self.on_challenge(request, response)
-                    if request_authorized:
-                        # if we receive a challenge response, we retrieve a new token
-                        # which matches the new target. In this case, we don't want to remove
-                        # token from the request so clear the 'insecure_domain_change' tag
-                        request.context.options.pop("insecure_domain_change", False)
-                        try:
-                            response = self.next.send(request)
-                            self.on_response(request, response)
-                        except Exception:  # pylint:disable=broad-except
-                            self.on_exception(request)
-                            raise
+
+        self.on_response(request, response)
+        if response.http_response.status_code == 401:
+            self._token = None  # any cached token is invalid
+            if "WWW-Authenticate" in response.http_response.headers:
+                request_authorized = self.on_challenge(request, response)
+                if request_authorized:
+                    # if we receive a challenge response, we retrieve a new token
+                    # which matches the new target. In this case, we don't want to remove
+                    # token from the request so clear the 'insecure_domain_change' tag
+                    request.context.options.pop("insecure_domain_change", False)
+                    try:
+                        response = self.next.send(request)
+                        self.on_response(request, response)
+                    except Exception:  # pylint:disable=broad-except
+                        self.on_exception(request)
+                        raise
 
         return response
 

sdk/core/azure-core/azure/core/pipeline/policies/_authentication_async.py

@@ -102,8 +102,7 @@ async def send(
         except Exception:  # pylint:disable=broad-except
             await await_result(self.on_exception, request)
             raise
-        else:
-            await await_result(self.on_response, request, response)
+        await await_result(self.on_response, request, response)
 
         if response.http_response.status_code == 401:
             self._token = None  # any cached token is invalid
@@ -119,8 +118,7 @@ async def send(
                     except Exception:  # pylint:disable=broad-except
                         await await_result(self.on_exception, request)
                         raise
-                    else:
-                        await await_result(self.on_response, request, response)
+                    await await_result(self.on_response, request, response)
 
         return response
 

sdk/core/azure-core/azure/core/tracing/decorator.py

@@ -27,12 +27,14 @@
 
 import functools
 
-from typing import Callable, Any, TypeVar, overload, Optional
+from typing import Callable, Any, TypeVar, overload, Optional, Mapping, TYPE_CHECKING
 from typing_extensions import ParamSpec
 from .common import change_context, get_function_and_class_name
 from . import SpanKind as _SpanKind
 from ..settings import settings
 
+if TYPE_CHECKING:
+    from azure.core.tracing import SpanKind
 
 P = ParamSpec("P")
 T = TypeVar("T")
@@ -44,28 +46,42 @@ def distributed_trace(__func: Callable[P, T]) -> Callable[P, T]:
 
 
 @overload
-def distributed_trace(  # pylint:disable=function-redefined
-    **kwargs: Any,  # pylint:disable=unused-argument
+def distributed_trace(
+    *,
+    name_of_span: Optional[str] = None,
+    kind: Optional["SpanKind"] = None,
+    tracing_attributes: Optional[Mapping[str, Any]] = None,
+    **kwargs: Any,
 ) -> Callable[[Callable[P, T]], Callable[P, T]]:
     pass
 
 
 def distributed_trace(
-    __func: Optional[Callable[P, T]] = None, **kwargs: Any
-) -> Any:  # pylint:disable=function-redefined
+    __func: Optional[Callable[P, T]] = None,  # pylint: disable=unused-argument
+    *,
+    name_of_span: Optional[str] = None,
+    kind: Optional["SpanKind"] = None,
+    tracing_attributes: Optional[Mapping[str, Any]] = None,
+    **kwargs: Any,
+) -> Any:
     """Decorator to apply to function to get traced automatically.
 
     Span will use the func name or "name_of_span".
 
-    :param callable func: A function to decorate
+    :param callable __func: A function to decorate
     :keyword name_of_span: The span name to replace func name if necessary
     :paramtype name_of_span: str
     :keyword kind: The kind of the span. INTERNAL by default.
     :paramtype kind: ~azure.core.tracing.SpanKind
+    :keyword tracing_attributes: Attributes to add to the span.
+    :paramtype tracing_attributes: Mapping[str, Any] or None
+    :return: The decorated function
+    :rtype: Any
     """
-    name_of_span = kwargs.pop("name_of_span", None)
-    tracing_attributes = kwargs.pop("tracing_attributes", {})
-    kind = kwargs.pop("kind", _SpanKind.INTERNAL)
+    if tracing_attributes is None:
+        tracing_attributes = {}
+    if kind is None:
+        kind = _SpanKind.INTERNAL
 
     def decorator(func: Callable[P, T]) -> Callable[P, T]:
         @functools.wraps(func)

sdk/core/azure-core/azure/core/tracing/decorator_async.py

@@ -27,12 +27,15 @@
 
 import functools
 
-from typing import Awaitable, Callable, Any, TypeVar, overload, Optional
+from typing import Awaitable, Callable, Any, TypeVar, overload, Optional, Mapping, TYPE_CHECKING
 from typing_extensions import ParamSpec
 from .common import change_context, get_function_and_class_name
 from . import SpanKind as _SpanKind
 from ..settings import settings
 
+if TYPE_CHECKING:
+    from azure.core.tracing import SpanKind
+
 P = ParamSpec("P")
 T = TypeVar("T")
 
@@ -43,28 +46,42 @@ def distributed_trace_async(__func: Callable[P, Awaitable[T]]) -> Callable[P, Aw
 
 
 @overload
-def distributed_trace_async(  # pylint:disable=function-redefined
-    **kwargs: Any,  # pylint:disable=unused-argument
+def distributed_trace_async(
+    *,
+    name_of_span: Optional[str] = None,
+    kind: Optional["SpanKind"] = None,
+    tracing_attributes: Optional[Mapping[str, Any]] = None,
+    **kwargs: Any,
 ) -> Callable[[Callable[P, Awaitable[T]]], Callable[P, Awaitable[T]]]:
     pass
 
 
-def distributed_trace_async(  # pylint:disable=function-redefined
-    __func: Optional[Callable[P, Awaitable[T]]] = None, **kwargs: Any
+def distributed_trace_async(
+    __func: Optional[Callable[P, Awaitable[T]]] = None,  # pylint: disable=unused-argument
+    *,
+    name_of_span: Optional[str] = None,
+    kind: Optional["SpanKind"] = None,
+    tracing_attributes: Optional[Mapping[str, Any]] = None,
+    **kwargs: Any,
 ) -> Any:
     """Decorator to apply to function to get traced automatically.
 
     Span will use the func name or "name_of_span".
 
-    :param callable func: A function to decorate
+    :param callable __func: A function to decorate
     :keyword name_of_span: The span name to replace func name if necessary
     :paramtype name_of_span: str
     :keyword kind: The kind of the span. INTERNAL by default.
     :paramtype kind: ~azure.core.tracing.SpanKind
+    :keyword tracing_attributes: Attributes to add to the span.
+    :paramtype tracing_attributes: Mapping[str, Any] or None
+    :return: The decorated function
+    :rtype: Any
     """
-    name_of_span = kwargs.pop("name_of_span", None)
-    tracing_attributes = kwargs.pop("tracing_attributes", {})
-    kind = kwargs.pop("kind", _SpanKind.INTERNAL)
+    if tracing_attributes is None:
+        tracing_attributes = {}
+    if kind is None:
+        kind = _SpanKind.INTERNAL
 
     def decorator(func: Callable[P, Awaitable[T]]) -> Callable[P, Awaitable[T]]:
         @functools.wraps(func)

sdk/core/corehttp/corehttp/runtime/policies/_authentication.py

@@ -116,22 +116,22 @@ def send(self, request: PipelineRequest[HTTPRequestType]) -> PipelineResponse[HT
         self.on_request(request)
         try:
             response = self.next.send(request)
-            self.on_response(request, response)
         except Exception:  # pylint:disable=broad-except
             self.on_exception(request)
             raise
-        else:
-            if response.http_response.status_code == 401:
-                self._token = None  # any cached token is invalid
-                if "WWW-Authenticate" in response.http_response.headers:
-                    request_authorized = self.on_challenge(request, response)
-                    if request_authorized:
-                        try:
-                            response = self.next.send(request)
-                            self.on_response(request, response)
-                        except Exception:  # pylint:disable=broad-except
-                            self.on_exception(request)
-                            raise
+
+        self.on_response(request, response)
+        if response.http_response.status_code == 401:
+            self._token = None  # any cached token is invalid
+            if "WWW-Authenticate" in response.http_response.headers:
+                request_authorized = self.on_challenge(request, response)
+                if request_authorized:
+                    try:
+                        response = self.next.send(request)
+                        self.on_response(request, response)
+                    except Exception:  # pylint:disable=broad-except
+                        self.on_exception(request)
+                        raise
 
         return response
 

sdk/core/corehttp/corehttp/runtime/policies/_authentication_async.py

@@ -91,8 +91,7 @@ async def send(
         except Exception:  # pylint:disable=broad-except
             await await_result(self.on_exception, request)
             raise
-        else:
-            await await_result(self.on_response, request, response)
+        await await_result(self.on_response, request, response)
 
         if response.http_response.status_code == 401:
             self._token = None  # any cached token is invalid
@@ -104,8 +103,7 @@ async def send(
                     except Exception:  # pylint:disable=broad-except
                         await await_result(self.on_exception, request)
                         raise
-                    else:
-                        await await_result(self.on_response, request, response)
+                    await await_result(self.on_response, request, response)
 
         return response