Improved typing

Author: antonpirker

sentry_sdk/integrations/aiohttp.py

@@ -157,7 +157,7 @@ async def sentry_urldispatcher_resolve(self, request):
 
                     scope.set_transaction_name(
                         name,
-                        source=source_for_style.get(integration.transaction_style),
+                        source=source_for_style[integration.transaction_style],
                     )
 
             return rv

sentry_sdk/integrations/bottle.py

@@ -42,7 +42,7 @@
 class BottleIntegration(Integration):
     identifier = "bottle"
 
-    transaction_style = None
+    transaction_style = ""
 
     def __init__(self, transaction_style="endpoint"):
         # type: (str) -> None

sentry_sdk/integrations/chalice.py

@@ -12,9 +12,9 @@
 from sentry_sdk._types import MYPY
 from sentry_sdk._functools import wraps
 
-import chalice  # type: ignore
+import chalice
 from chalice import Chalice, ChaliceViewError
-from chalice.app import EventSourceHandler as ChaliceEventSourceHandler  # type: ignore
+from chalice.app import EventSourceHandler as ChaliceEventSourceHandler
 
 if MYPY:
     from typing import Any
@@ -30,7 +30,7 @@
     raise DidNotEnable("Chalice is not installed")
 
 
-class EventSourceHandler(ChaliceEventSourceHandler):  # type: ignore
+class EventSourceHandler(ChaliceEventSourceHandler):
     def __call__(self, event, context):
         # type: (Any, Any) -> Any
         hub = Hub.current

sentry_sdk/integrations/django/__init__.py

@@ -84,7 +84,7 @@ def is_authenticated(request_user):
 class DjangoIntegration(Integration):
     identifier = "django"
 
-    transaction_style = None
+    transaction_style = ""
     middleware_spans = None
 
     def __init__(self, transaction_style="url", middleware_spans=True):
@@ -324,10 +324,12 @@ def _patch_django_asgi_handler():
 def _set_transaction_name_and_source(scope, transaction_style, request):
     # type: (Scope, str, WSGIRequest) -> Scope
     try:
-        transaction_name = None
+        transaction_name = ""
         if transaction_style == "function_name":
             fn = resolve(request.path).func
-            transaction_name = transaction_from_function(getattr(fn, "view_class", fn))
+            transaction_name = (
+                transaction_from_function(getattr(fn, "view_class", fn)) or ""
+            )
 
         elif transaction_style == "url":
             if hasattr(request, "urlconf"):
@@ -344,7 +346,7 @@ def _set_transaction_name_and_source(scope, transaction_style, request):
 
         scope.set_transaction_name(
             transaction_name,
-            source=source_for_style.get(transaction_style),
+            source=source_for_style[transaction_style],
         )
     except Exception:
         pass

sentry_sdk/integrations/falcon.py

@@ -92,7 +92,7 @@ def process_request(self, req, resp, *args, **kwargs):
 class FalconIntegration(Integration):
     identifier = "falcon"
 
-    transaction_style = None
+    transaction_style = ""
 
     def __init__(self, transaction_style="uri_template"):
         # type: (str) -> None

sentry_sdk/integrations/flask.py

@@ -28,8 +28,8 @@
 
 try:
     from flask import Flask, Markup, Request  # type: ignore
-    from flask import __version__ as FLASK_VERSION  # type: ignore
-    from flask import _app_ctx_stack, _request_ctx_stack  # type: ignore
+    from flask import __version__ as FLASK_VERSION
+    from flask import _app_ctx_stack, _request_ctx_stack
     from flask.signals import (
         before_render_template,
         got_request_exception,
@@ -49,7 +49,7 @@
 class FlaskIntegration(Integration):
     identifier = "flask"
 
-    transaction_style = None
+    transaction_style = ""
 
     def __init__(self, transaction_style="endpoint"):
         # type: (str) -> None
@@ -123,8 +123,8 @@ def _set_transaction_name_and_source(scope, transaction_style, request):
         }
 
         scope.set_transaction_name(
-            name_for_style.get(transaction_style),
-            source=source_for_style.get(transaction_style),
+            name_for_style[transaction_style],
+            source=source_for_style[transaction_style],
         )
     except Exception:
         pass

sentry_sdk/integrations/pyramid.py

@@ -57,7 +57,7 @@ def authenticated_userid(request):
 class PyramidIntegration(Integration):
     identifier = "pyramid"
 
-    transaction_style = None
+    transaction_style = ""
 
     def __init__(self, transaction_style="route_name"):
         # type: (str) -> None
@@ -170,8 +170,8 @@ def _set_transaction_name_and_source(scope, transaction_style, request):
         }
 
         scope.set_transaction_name(
-            name_for_style.get(transaction_style),
-            source=source_for_style.get(transaction_style),
+            name_for_style[transaction_style],
+            source=source_for_style[transaction_style],
         )
     except Exception:
         pass

sentry_sdk/integrations/quart.py

@@ -50,7 +50,7 @@
 class QuartIntegration(Integration):
     identifier = "quart"
 
-    transaction_style = None
+    transaction_style = ""
 
     def __init__(self, transaction_style="endpoint"):
         # type: (str) -> None
@@ -99,8 +99,8 @@ def _set_transaction_name_and_source(scope, transaction_style, request):
         }
 
         scope.set_transaction_name(
-            name_for_style.get(transaction_style),
-            source=source_for_style.get(transaction_style),
+            name_for_style[transaction_style],
+            source=source_for_style[transaction_style],
         )
     except Exception:
         pass