Fix some typing after merge

Author: sl0thentr0py

sentry_sdk/api.py

@@ -344,8 +344,11 @@ def set_transaction_name(name: str, source: Optional[str] = None) -> None:
     return get_current_scope().set_transaction_name(name, source)
 
 
-def update_current_span(op=None, name=None, attributes=None):
-    # type: (Optional[str], Optional[str], Optional[dict[str, Union[str, int, float, bool]]]) -> None
+def update_current_span(
+    op: Optional[str] = None,
+    name: Optional[str] = None,
+    attributes: Optional[dict[str, Union[str, int, float, bool]]] = None,
+) -> None:
     """
     Update the current active span with the provided parameters.
 

sentry_sdk/integrations/anthropic.py

@@ -154,7 +154,7 @@ def _set_output_data(
     model: str | None,
     input_tokens: int,
     output_tokens: int,
-    content_blocks: list[str],
+    content_blocks: list[Any],
     finish_span: bool = False,
 ) -> None:
     """

sentry_sdk/integrations/asgi.py

@@ -152,7 +152,7 @@ def __init__(
         if asgi_version == 3:
             self.__call__: Callable[..., Any] = self._run_asgi3
         elif asgi_version == 2:
-            self.__call__: Callable[..., Any] = self._run_asgi2
+            self.__call__: Callable[..., Any] = self._run_asgi2  # type: ignore
 
     def _capture_lifespan_exception(self, exc: Exception) -> None:
         """Capture exceptions raise in application lifespan handlers.

sentry_sdk/integrations/clickhouse_driver.py

@@ -137,7 +137,7 @@ def _wrap_send_data() -> None:
     original_send_data = clickhouse_driver.client.Client.send_data
 
     def _inner_send_data(
-        self,
+        self: clickhouse_driver.client.Client,
         sample_block: Any,
         data: Any,
         types_check: bool = False,

sentry_sdk/integrations/django/asgi.py

@@ -157,7 +157,7 @@ async def sentry_patched_asgi_handler(
                 http_methods_to_capture=integration.http_methods_to_capture,
             )
 
-            return await middleware(self.scope)(receive, send)  # type: ignore
+            return await middleware(self.scope)(receive, send)
 
         cls.__call__ = sentry_patched_asgi_handler
 

sentry_sdk/integrations/starlite.py

@@ -17,7 +17,7 @@
     from starlite.plugins.base import get_plugin_for_value  # type: ignore
     from starlite.routes.http import HTTPRoute  # type: ignore
     from starlite.utils import ConnectionDataExtractor, is_async_callable, Ref  # type: ignore
-    from pydantic import BaseModel
+    from pydantic import BaseModel  # type: ignore
 except ImportError:
     raise DidNotEnable("Starlite is not installed")
 

sentry_sdk/scope.py

@@ -61,7 +61,7 @@
         Self,
     )
 
-    from collections.abc import Mapping, MutableMapping
+    from collections.abc import Mapping
 
     import sentry_sdk
     from sentry_sdk._types import (
@@ -627,12 +627,12 @@ def clear(self) -> None:
         self._level: Optional[LogLevelStr] = None
         self._fingerprint: Optional[List[str]] = None
         self._transaction: Optional[str] = None
-        self._transaction_info: MutableMapping[str, str] = {}
+        self._transaction_info: Dict[str, str] = {}
         self._user: Optional[Dict[str, Any]] = None
 
         self._tags: Dict[str, Any] = {}
         self._contexts: Dict[str, Dict[str, Any]] = {}
-        self._extras: MutableMapping[str, Any] = {}
+        self._extras: Dict[str, Any] = {}
         self._attachments: List[Attachment] = []
 
         self.clear_breadcrumbs()