fix(types): Replace custom TYPE_CHECKING with stdlib typing.TYPE_CHECKING

scripts/init_serverless_sdk.py

@@ -11,7 +11,7 @@
 import re
 
 import sentry_sdk
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 from sentry_sdk.integrations.aws_lambda import AwsLambdaIntegration
 
 if TYPE_CHECKING:

sentry_sdk/_compat.py

@@ -1,6 +1,6 @@
 import sys
 
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Any

sentry_sdk/_queue.py

@@ -76,7 +76,7 @@
 from collections import deque
 from time import time
 
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Any

sentry_sdk/_types.py

@@ -1,7 +1,4 @@
-try:
-    from typing import TYPE_CHECKING
-except ImportError:
-    TYPE_CHECKING = False
+from typing import TYPE_CHECKING
 
 
 # Re-exported for compat, since code out there in the wild might use this variable.

sentry_sdk/_werkzeug.py

@@ -32,7 +32,7 @@
 SUCH DAMAGE.
 """
 
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Dict

sentry_sdk/ai/monitoring.py

@@ -5,7 +5,7 @@
 from sentry_sdk import start_span
 from sentry_sdk.tracing import Span
 from sentry_sdk.utils import ContextVar
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Optional, Callable, Any

sentry_sdk/ai/utils.py

@@ -1,4 +1,4 @@
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Any

sentry_sdk/api.py

@@ -10,7 +10,7 @@
 from sentry_sdk.crons import monitor
 
 
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from collections.abc import Mapping

sentry_sdk/attachments.py

@@ -1,7 +1,7 @@
 import os
 import mimetypes
 
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 from sentry_sdk.envelope import Item, PayloadRef
 
 if TYPE_CHECKING:

sentry_sdk/client.py

@@ -44,7 +44,7 @@
 from sentry_sdk.monitor import Monitor
 from sentry_sdk.spotlight import setup_spotlight
 
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Any
@@ -881,7 +881,7 @@ def __exit__(self, exc_type, exc_value, tb):
         self.close()
 
 
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     # Make mypy, PyCharm and other static analyzers think `get_options` is a

sentry_sdk/consts.py

@@ -1,7 +1,7 @@
 import itertools
 
 from enum import Enum
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 # up top to prevent circular import due to integration import
 DEFAULT_MAX_VALUE_LENGTH = 1024

sentry_sdk/crons/api.py

@@ -1,7 +1,7 @@
 import uuid
 
 import sentry_sdk
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 
 if TYPE_CHECKING:

sentry_sdk/crons/decorator.py

@@ -1,7 +1,7 @@
 from functools import wraps
 from inspect import iscoroutinefunction
 
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 from sentry_sdk.crons import capture_checkin
 from sentry_sdk.crons.consts import MonitorStatus
 from sentry_sdk.utils import now

sentry_sdk/envelope.py

@@ -2,7 +2,7 @@
 import json
 import mimetypes
 
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 from sentry_sdk.session import Session
 from sentry_sdk.utils import json_dumps, capture_internal_exceptions
 

sentry_sdk/hub.py

@@ -22,7 +22,7 @@
     ContextVar,
 )
 
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Any

sentry_sdk/integrations/__init__.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from threading import Lock
 
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 from sentry_sdk.utils import logger
 
 

sentry_sdk/integrations/_asgi_common.py

@@ -2,7 +2,7 @@
 
 from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.integrations._wsgi_common import _filter_headers
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Any

sentry_sdk/integrations/_wsgi_common.py

@@ -4,7 +4,7 @@
 import sentry_sdk
 from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.utils import AnnotatedValue, logger
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 try:
     from django.http.request import RawPostDataException

sentry_sdk/integrations/aiohttp.py

@@ -41,7 +41,7 @@
 except ImportError:
     raise DidNotEnable("AIOHTTP not installed")
 
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from aiohttp.web_request import Request

sentry_sdk/integrations/argv.py

@@ -4,7 +4,7 @@
 from sentry_sdk.integrations import Integration
 from sentry_sdk.scope import add_global_event_processor
 
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Optional

sentry_sdk/integrations/ariadne.py

@@ -12,7 +12,7 @@
     event_from_exception,
     package_version,
 )
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 try:
     # importing like this is necessary due to name shadowing in ariadne

sentry_sdk/integrations/arq.py

@@ -1,7 +1,7 @@
 import sys
 
 import sentry_sdk
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 from sentry_sdk.consts import OP, SPANSTATUS
 from sentry_sdk.integrations import DidNotEnable, Integration
 from sentry_sdk.integrations.logging import ignore_logger

sentry_sdk/integrations/asgi.py

@@ -10,7 +10,7 @@
 from functools import partial
 
 import sentry_sdk
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 from sentry_sdk.api import continue_trace
 from sentry_sdk.consts import OP
 

sentry_sdk/integrations/asyncio.py

@@ -3,7 +3,7 @@
 import sentry_sdk
 from sentry_sdk.consts import OP
 from sentry_sdk.integrations import Integration, DidNotEnable
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 from sentry_sdk.utils import event_from_exception, reraise
 
 try:

sentry_sdk/integrations/atexit.py

@@ -6,7 +6,7 @@
 from sentry_sdk.utils import logger
 from sentry_sdk.integrations import Integration
 from sentry_sdk.utils import ensure_integration_enabled
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Any

sentry_sdk/integrations/aws_lambda.py

@@ -19,7 +19,7 @@
 )
 from sentry_sdk.integrations import Integration
 from sentry_sdk.integrations._wsgi_common import _filter_headers
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Any

sentry_sdk/integrations/beam.py

@@ -11,7 +11,7 @@
     event_from_exception,
     reraise,
 )
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Any

sentry_sdk/integrations/boto3.py

@@ -5,7 +5,7 @@
 from sentry_sdk.integrations import Integration, DidNotEnable
 from sentry_sdk.tracing import Span
 
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 from sentry_sdk.utils import (
     capture_internal_exceptions,
     ensure_integration_enabled,

sentry_sdk/integrations/bottle.py

@@ -10,7 +10,7 @@
 from sentry_sdk.integrations import Integration, DidNotEnable
 from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
 from sentry_sdk.integrations._wsgi_common import RequestExtractor
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from sentry_sdk.integrations.wsgi import _ScopedResponse

sentry_sdk/integrations/celery/__init__.py

@@ -15,7 +15,7 @@
 from sentry_sdk.integrations.celery.utils import _now_seconds_since_epoch
 from sentry_sdk.integrations.logging import ignore_logger
 from sentry_sdk.tracing import BAGGAGE_HEADER_NAME, TRANSACTION_SOURCE_TASK
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 from sentry_sdk.tracing_utils import Baggage
 from sentry_sdk.utils import (
     capture_internal_exceptions,

sentry_sdk/integrations/celery/beat.py

@@ -5,7 +5,7 @@
     _get_humanized_interval,
     _now_seconds_since_epoch,
 )
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 from sentry_sdk.utils import (
     logger,
     match_regex_list,

sentry_sdk/integrations/celery/utils.py

@@ -1,7 +1,7 @@
 import time
 from typing import cast
 
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Any, Tuple

sentry_sdk/integrations/chalice.py

@@ -11,7 +11,7 @@
     parse_version,
     reraise,
 )
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 try:
     import chalice  # type: ignore

sentry_sdk/integrations/clickhouse_driver.py

@@ -2,7 +2,7 @@
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import Integration, DidNotEnable
 from sentry_sdk.tracing import Span
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.utils import capture_internal_exceptions, ensure_integration_enabled
 

sentry_sdk/integrations/cloud_resource_context.py

@@ -5,7 +5,7 @@
 from sentry_sdk.api import set_context
 from sentry_sdk.utils import logger
 
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Dict

sentry_sdk/integrations/cohere.py

@@ -1,7 +1,7 @@
 from functools import wraps
 
 from sentry_sdk import consts
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 from sentry_sdk.ai.monitoring import record_token_usage
 from sentry_sdk.consts import SPANDATA
 from sentry_sdk.ai.utils import set_data_normalized

sentry_sdk/integrations/dedupe.py

@@ -3,7 +3,7 @@
 from sentry_sdk.integrations import Integration
 from sentry_sdk.scope import add_global_event_processor
 
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Optional

sentry_sdk/integrations/django/__init__.py

@@ -5,7 +5,7 @@
 from importlib import import_module
 
 import sentry_sdk
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.db.explain_plan.django import attach_explain_plan_to_span
 from sentry_sdk.scope import add_global_event_processor, should_send_default_pii

sentry_sdk/integrations/django/asgi.py

@@ -13,7 +13,7 @@
 from django.core.handlers.wsgi import WSGIRequest
 
 import sentry_sdk
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 from sentry_sdk.consts import OP
 
 from sentry_sdk.integrations.asgi import SentryAsgiMiddleware

sentry_sdk/integrations/django/middleware.py

@@ -7,7 +7,7 @@
 from django import VERSION as DJANGO_VERSION
 
 import sentry_sdk
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 from sentry_sdk.consts import OP
 from sentry_sdk.utils import (
     ContextVar,

sentry_sdk/integrations/django/signals_handlers.py

@@ -3,7 +3,7 @@
 from django.dispatch import Signal
 
 import sentry_sdk
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 from sentry_sdk.consts import OP
 from sentry_sdk.integrations.django import DJANGO_VERSION
 

sentry_sdk/integrations/django/templates.py

@@ -5,7 +5,7 @@
 from django import VERSION as DJANGO_VERSION
 
 import sentry_sdk
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 from sentry_sdk.consts import OP
 from sentry_sdk.utils import ensure_integration_enabled
 

sentry_sdk/integrations/django/transactions.py

@@ -7,7 +7,7 @@
 
 import re
 
-from sentry_sdk._types import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from django.urls.resolvers import URLResolver