Merge branch 'master' into sentry-sdk-2.0

Author: antonpirker

sentry_sdk/types.py

@@ -13,9 +13,11 @@
 if TYPE_CHECKING:
     from sentry_sdk._types import Event, Hint
 else:
+    from typing import Any
+
     # The lines below allow the types to be imported from outside `if TYPE_CHECKING`
     # guards. The types in this module are only intended to be used for type hints.
-    Event = None
-    Hint = None
+    Event = Any
+    Hint = Any
 
 __all__ = ("Event", "Hint")

tests/test_types.py

@@ -0,0 +1,28 @@
+import sys
+
+import pytest
+from sentry_sdk.types import Event, Hint
+
+
+@pytest.mark.skipif(
+    sys.version_info < (3, 10),
+    reason="Type hinting with `|` is available in Python 3.10+",
+)
+def test_event_or_none_runtime():
+    """
+    Ensures that the `Event` type's runtime value supports the `|` operation with `None`.
+    This test is needed to ensure that using an `Event | None` type hint (e.g. for
+    `before_send`'s return value) does not raise a TypeError at runtime.
+    """
+    Event | None
+
+
+@pytest.mark.skipif(
+    sys.version_info < (3, 10),
+    reason="Type hinting with `|` is available in Python 3.10+",
+)
+def test_hint_or_none_runtime():
+    """
+    Analogue to `test_event_or_none_runtime`, but for the `Hint` type.
+    """
+    Hint | None