Fix some casts

Author: sl0thentr0py

sentry_sdk/scrubber.py

@@ -5,10 +5,10 @@
     iter_event_frames,
 )
 
-from typing import TYPE_CHECKING, cast
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from typing import List, Dict, Optional
+    from typing import List, Optional
     from sentry_sdk._types import Event
 
 
@@ -159,9 +159,10 @@ def scrub_frames(self, event: Event) -> None:
     def scrub_spans(self, event: Event) -> None:
         with capture_internal_exceptions():
             if "spans" in event:
-                for span in cast("List[Dict[str, object]]", event["spans"]):
-                    if "data" in span:
-                        self.scrub_dict(span["data"])
+                if not isinstance(event["spans"], AnnotatedValue):
+                    for span in event["spans"]:
+                        if "data" in span:
+                            self.scrub_dict(span["data"])
 
     def scrub_event(self, event: Event) -> None:
         self.scrub_request(event)

sentry_sdk/tracing.py

@@ -46,7 +46,7 @@
     should_be_treated_as_error,
 )
 
-from typing import TYPE_CHECKING, cast, overload
+from typing import TYPE_CHECKING, overload
 
 if TYPE_CHECKING:
     from typing import (
@@ -290,8 +290,8 @@ def origin(self, value: Optional[str]) -> None:
 
     @property
     def root_span(self) -> Optional[Span]:
-        root_otel_span = cast(
-            "Optional[OtelSpan]", get_sentry_meta(self._otel_span, "root_span")
+        root_otel_span: Optional[OtelSpan] = get_sentry_meta(
+            self._otel_span, "root_span"
         )
         return Span(otel_span=root_otel_span) if root_otel_span else None
 

sentry_sdk/transport.py

@@ -31,7 +31,7 @@
 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
 
 if TYPE_CHECKING:
     from typing import (
@@ -152,7 +152,7 @@ def __del__(self: Self) -> None:
 
 def _parse_rate_limits(
     header: str, now: Optional[datetime] = None
-) -> Iterable[Tuple[Optional[EventDataCategory], datetime]]:
+) -> Iterable[Tuple[Optional[str], datetime]]:
     if now is None:
         now = datetime.now(timezone.utc)
 
@@ -163,7 +163,6 @@ def _parse_rate_limits(
 
             retry_after = now + timedelta(seconds=int(retry_after_val))
             for category in categories and categories.split(";") or (None,):
-                category = cast("Optional[EventDataCategory]", category)
                 yield category, retry_after
         except (LookupError, ValueError):
             continue
@@ -182,7 +181,7 @@ def __init__(self: Self, options: Dict[str, Any]) -> None:
         self.options: Dict[str, Any] = options
         self._worker = BackgroundWorker(queue_size=options["transport_queue_size"])
         self._auth = self.parsed_dsn.to_auth("sentry.python/%s" % VERSION)
-        self._disabled_until: Dict[Optional[EventDataCategory], datetime] = {}
+        self._disabled_until: Dict[Optional[str], datetime] = {}
         # We only use this Retry() class for the `get_retry_after` method it exposes
         self._retry = urllib3.util.Retry()
         self._discarded_events: DefaultDict[Tuple[EventDataCategory, str], int] = (
@@ -251,9 +250,7 @@ def record_lost_event(
                 event = item.get_transaction_event() or {}
 
                 # +1 for the transaction itself
-                span_count = (
-                    len(cast("List[Dict[str, object]]", event.get("spans") or [])) + 1
-                )
+                span_count = len(event.get("spans") or []) + 1
                 self.record_lost_event(reason, "span", quantity=span_count)
 
             elif data_category == "attachment":

sentry_sdk/utils.py

@@ -1027,14 +1027,10 @@ def exc_info_from_error(error: Union[BaseException, ExcInfo]) -> ExcInfo:
     else:
         raise ValueError("Expected Exception object to report, got %s!" % type(error))
 
-    exc_info = (exc_type, exc_value, tb)
-
-    if TYPE_CHECKING:
-        # This cast is safe because exc_type and exc_value are either both
-        # None or both not None.
-        exc_info = cast("ExcInfo", exc_info)
-
-    return exc_info
+    if exc_type is not None and exc_value is not None:
+        return (exc_type, exc_value, tb)
+    else:
+        return (None, None, None)
 
 
 def merge_stack_frames(