Merge branch 'webb/test-ci-3' of github.com:getsentry/sentry-python into webb/test-ci-3

Author: alexander-alderman-webb

sentry_sdk/integrations/_wsgi_common.py

@@ -9,8 +9,11 @@
 
 try:
     from django.http.request import RawPostDataException
+
+    _RAW_DATA_EXCEPTIONS = (RawPostDataException, ValueError)
 except ImportError:
     RawPostDataException = None
+    _RAW_DATA_EXCEPTIONS = (ValueError,)
 
 from typing import TYPE_CHECKING
 
@@ -110,7 +113,7 @@ def extract_into_event(self, event: "Event") -> None:
             raw_data = None
             try:
                 raw_data = self.raw_data()
-            except (RawPostDataException, ValueError):
+            except _RAW_DATA_EXCEPTIONS:
                 # If DjangoRestFramework is used it already read the body for us
                 # so reading it here will fail. We can ignore this.
                 pass
@@ -175,7 +178,7 @@ def json(self) -> "Optional[Any]":
 
             try:
                 raw_data = self.raw_data()
-            except (RawPostDataException, ValueError):
+            except _RAW_DATA_EXCEPTIONS:
                 # The body might have already been read, in which case this will
                 # fail
                 raw_data = None

sentry_sdk/integrations/django/__init__.py

@@ -120,9 +120,9 @@ class DjangoIntegration(Integration):
     origin_db = f"auto.db.{identifier}"
 
     transaction_style = ""
-    middleware_spans = None
-    signals_spans = None
-    cache_spans = None
+    middleware_spans: "Optional[bool]" = None
+    signals_spans: "Optional[bool]" = None
+    cache_spans: "Optional[bool]" = None
     signals_denylist: "list[signals.Signal]" = []
 
     def __init__(

sentry_sdk/integrations/django/asgi.py

@@ -44,7 +44,7 @@
     iscoroutinefunction = inspect.iscoroutinefunction
     markcoroutinefunction = inspect.markcoroutinefunction
 else:
-    iscoroutinefunction = asyncio.iscoroutinefunction  # type: ignore[assignment]
+    iscoroutinefunction = asyncio.iscoroutinefunction
 
     def markcoroutinefunction(func: "_F") -> "_F":
         func._is_coroutine = asyncio.coroutines._is_coroutine  # type: ignore

sentry_sdk/integrations/gnu_backtrace.py

@@ -16,14 +16,14 @@
 FUNCTION_RE = r"[^@]+?"
 HEX_ADDRESS = r"\s+@\s+0x[0-9a-fA-F]+"
 
-FRAME_RE = r"""
+_FRAME_RE_PATTERN = r"""
 ^(?P<index>\d+)\.\s+(?P<function>{FUNCTION_RE}){HEX_ADDRESS}(?:\s+in\s+(?P<package>.+))?$
 """.format(
     FUNCTION_RE=FUNCTION_RE,
     HEX_ADDRESS=HEX_ADDRESS,
 )
 
-FRAME_RE = re.compile(FRAME_RE, re.MULTILINE | re.VERBOSE)
+FRAME_RE = re.compile(_FRAME_RE_PATTERN, re.MULTILINE | re.VERBOSE)
 
 
 class GnuBacktraceIntegration(Integration):

sentry_sdk/integrations/starlette.py

@@ -475,7 +475,7 @@ def _is_async_callable(obj: "Any") -> bool:
         obj = obj.func
 
     return iscoroutinefunction(obj) or (
-        callable(obj) and iscoroutinefunction(obj.__call__)
+        callable(obj) and iscoroutinefunction(obj.__call__)  # type: ignore[operator]
     )