resolve conflits

Author: alexander-alderman-webb

sentry_sdk/_compat.py

@@ -54,7 +54,7 @@ def enabled(option: str) -> bool:
             except Exception:
                 pass
 
-        return value and str(value).lower() not in FALSE_VALUES  # type: ignore
+        return value and str(value).lower() not in FALSE_VALUES  # type: ignore[return-value]
 
     # When `threads` is passed in as a uwsgi option,
     # `enable-threads` is implied on.

sentry_sdk/integrations/mcp.py

@@ -495,7 +495,7 @@ async def _handler_wrapper(
                         uri = original_kwargs.get("uri")
 
                     protocol = None
-                    if hasattr(uri, "scheme") and uri.scheme is not None:
+                    if uri is not None and hasattr(uri, "scheme"):
                         protocol = uri.scheme
                     elif handler_name and "://" in handler_name:
                         protocol = handler_name.split("://")[0]

sentry_sdk/serializer.py

@@ -338,9 +338,9 @@ def _serialize_node_impl(
         ):
             rv_list = []
 
-            for i, v in enumerate(obj):  # type: ignore
+            for i, v in enumerate(obj):  # type: ignore[arg-type]
                 if remaining_breadth is not None and i >= remaining_breadth:
-                    _annotate(len=len(obj))  # type: ignore
+                    _annotate(len=len(obj))  # type: ignore[arg-type]
                     break
 
                 rv_list.append(