fix(spans): fixing mypy issues

Author: constantinius

sentry_sdk/client.py

@@ -5,7 +5,7 @@
 from collections.abc import Mapping
 from datetime import datetime, timezone
 from importlib import import_module
-from typing import cast, overload
+from typing import TYPE_CHECKING, List, Dict, cast, overload
 import warnings
 
 from sentry_sdk._compat import PY37, check_uwsgi_thread_support
@@ -46,8 +46,6 @@
 from sentry_sdk.monitor import Monitor
 from sentry_sdk.spotlight import setup_spotlight
 
-from typing import TYPE_CHECKING
-
 if TYPE_CHECKING:
     from typing import Any
     from typing import Callable
@@ -491,7 +489,7 @@ def _prepare_event(
 
         if scope is not None:
             is_transaction = event.get("type") == "transaction"
-            spans_before = len(cast(list[dict[str, object]], event.get("spans", [])))
+            spans_before = len(cast(List[Dict[str, object]], event.get("spans", [])))
             event_ = scope.apply_to_event(event, hint, self.options)
 
             # one of the event/error processors returned None
@@ -511,7 +509,7 @@ def _prepare_event(
 
             event = event_
             spans_delta = spans_before - len(
-                cast(list[dict[str, object]], event.get("spans", []))
+                cast(List[Dict[str, object]], event.get("spans", []))
             )
             if is_transaction and spans_delta > 0 and self.transport is not None:
                 self.transport.record_lost_event(
@@ -611,7 +609,7 @@ def _prepare_event(
             and event.get("type") == "transaction"
         ):
             new_event = None
-            spans_before = len(cast(list[dict[str, object]], event.get("spans", [])))
+            spans_before = len(cast(List[Dict[str, object]], event.get("spans", [])))
             with capture_internal_exceptions():
                 new_event = before_send_transaction(event, hint or {})
             if new_event is None:

sentry_sdk/scrubber.py

@@ -4,11 +4,10 @@
     iter_event_frames,
 )
 
-from typing import TYPE_CHECKING, cast
+from typing import TYPE_CHECKING, cast, List, Dict
 
 if TYPE_CHECKING:
     from sentry_sdk._types import Event
-    from typing import List
     from typing import Optional
 
 
@@ -161,7 +160,7 @@ def scrub_spans(self, event):
         # type: (Event) -> None
         with capture_internal_exceptions():
             if "spans" in event:
-                for span in cast(list[dict[str, object]], event["spans"]):
+                for span in cast(List[Dict[str, object]], event["spans"]):
                     if "data" in span:
                         self.scrub_dict(span["data"])
 

sentry_sdk/transport.py

@@ -24,15 +24,13 @@
 from sentry_sdk.worker import BackgroundWorker
 from sentry_sdk.envelope import Envelope, Item, PayloadRef
 
-from typing import TYPE_CHECKING, cast
+from typing import TYPE_CHECKING, cast, List, Dict
 
 if TYPE_CHECKING:
     from typing import Any
     from typing import Callable
-    from typing import Dict
     from typing import DefaultDict
     from typing import Iterable
-    from typing import List
     from typing import Mapping
     from typing import Optional
     from typing import Self
@@ -281,7 +279,7 @@ def record_lost_event(
 
                 # +1 for the transaction itself
                 span_count = (
-                    len(cast(list[dict[str, object]], event.get("spans") or [])) + 1
+                    len(cast(List[Dict[str, object]], event.get("spans") or [])) + 1
                 )
                 self.record_lost_event(reason, "span", quantity=span_count)
 
@@ -722,7 +720,7 @@ def _request(
 
 try:
     import httpcore
-    import h2  # type: ignore # noqa: F401
+    import h2  # noqa: F401
 except ImportError:
     # Sorry, no Http2Transport for you
     class Http2Transport(HttpTransport):