fix: Better signatures for contextmanagers

Author: untitaker

sentry_sdk/api.py

@@ -10,7 +10,7 @@
     from typing import Optional
     from typing import overload
     from typing import Callable
-    from contextlib import AbstractContextManager
+    from contextlib import ContextManager
 else:
 
     def overload(x):
@@ -67,13 +67,13 @@ def add_breadcrumb(*args, **kwargs):
 
 @overload  # noqa
 def configure_scope():
-    # type: () -> AbstractContextManager
+    # type: () -> ContextManager[Scope]
     pass
 
 
 @overload  # noqa
 def configure_scope(callback):
-    # type: (Callable) -> None
+    # type: (Callable[[Scope], None]) -> None
     pass
 
 
@@ -96,13 +96,13 @@ def inner():
 
 @overload  # noqa
 def push_scope():
-    # type: () -> AbstractContextManager
+    # type: () -> ContextManager[Scope]
     pass
 
 
 @overload  # noqa
 def push_scope(callback):
-    # type: (Callable) -> None
+    # type: (Callable[[Scope], None]) -> None
     pass
 
 

sentry_sdk/consts.py

@@ -38,6 +38,7 @@
             "attach_stacktrace": bool,
             "ca_certs": Optional[str],
         },
+        total=False,
     )
 
 

sentry_sdk/hub.py

@@ -25,7 +25,7 @@
     from typing import List
     from typing import Callable
     from typing import overload
-    from contextlib import AbstractContextManager
+    from contextlib import ContextManager
     from sentry_sdk.integrations import Integration
 else:
 
@@ -342,12 +342,12 @@ def add_breadcrumb(self, crumb=None, hint=None, **kwargs):
 
     @overload  # noqa
     def push_scope(self):
-        # type: () -> AbstractContextManager
+        # type: () -> ContextManager[Scope]
         pass
 
     @overload  # noqa
     def push_scope(self, callback):
-        # type: (Callable) -> None
+        # type: (Callable[[Scope], None]) -> None
         pass
 
     def push_scope(self, callback=None):  # noqa
@@ -378,12 +378,12 @@ def pop_scope_unsafe(self):
 
     @overload  # noqa
     def configure_scope(self):
-        # type: () -> AbstractContextManager
+        # type: () -> ContextManager[Scope]
         pass
 
     @overload  # noqa
     def configure_scope(self, callback):
-        # type: (Callable) -> None
+        # type: (Callable[[Scope], None]) -> None
         pass
 
     def configure_scope(self, callback=None):  # noqa