'Refactored by Sourcery'

Edrolo · sourcery-ai · Dec 1, 2021 · Dec 1, 2021 · 33b2e5787411766e537f0ad7100e100b1fa34316 · sourcery-ai
commit 33b2e5787411766e537f0ad7100e100b1fa34316
diff --git a/examples/tracing/tracing.py b/examples/tracing/tracing.py
@@ -60,9 +60,8 @@ def wait(redis_key):
     result = redis_conn.get(redis_key)
     if result is None:
         return "NONE"
-    else:
-        redis_conn.delete(redis_key)
-        return "RESULT: {}".format(result)
+    redis_conn.delete(redis_key)
+    return "RESULT: {}".format(result)
 
 
 @app.cli.command("worker")

diff --git a/sentry_sdk/attachments.py b/sentry_sdk/attachments.py
@@ -37,10 +37,7 @@ def to_envelope_item(self):
         """Returns an envelope item for this attachment."""
         payload = None  # type: Union[None, PayloadRef, bytes]
         if self.bytes is not None:
-            if callable(self.bytes):
-                payload = self.bytes()
-            else:
-                payload = self.bytes
+            payload = self.bytes() if callable(self.bytes) else self.bytes
         else:
             payload = PayloadRef(path=self.path)
         return Item(

diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
@@ -214,17 +214,13 @@ def _is_ignored_error(self, event, hint):
         type_name = get_type_name(exc_info[0])
         full_name = "%s.%s" % (exc_info[0].__module__, type_name)
 
-        for errcls in self.options["ignore_errors"]:
-            # String types are matched against the type name in the
-            # exception only
-            if isinstance(errcls, string_types):
-                if errcls == full_name or errcls == type_name:
-                    return True
-            else:
-                if issubclass(exc_info[0], errcls):
-                    return True
-
-        return False
+        return any(
+            isinstance(errcls, string_types)
+            and errcls in [full_name, type_name]
+            or not isinstance(errcls, string_types)
+            and issubclass(exc_info[0], errcls)
+            for errcls in self.options["ignore_errors"]
+        )
 
     def _should_capture(
         self,
@@ -249,10 +245,7 @@ def _should_capture(
                 self.transport.record_lost_event("sample_rate", data_category="error")
             return False
 
-        if self._is_ignored_error(event, hint):
-            return False
-
-        return True
+        return not self._is_ignored_error(event, hint)
 
     def _update_session_from_event(
         self,

diff --git a/sentry_sdk/envelope.py b/sentry_sdk/envelope.py
@@ -36,10 +36,7 @@ def __init__(
         if headers is not None:
             headers = dict(headers)
         self.headers = headers or {}
-        if items is None:
-            items = []
-        else:
-            items = list(items)
+        items = [] if items is None else list(items)
         self.items = items
 
     @property
@@ -196,10 +193,7 @@ def __init__(
         content_type=None,  # type: Optional[str]
         filename=None,  # type: Optional[str]
     ):
-        if headers is not None:
-            headers = dict(headers)
-        elif headers is None:
-            headers = {}
+        headers = dict(headers) if headers is not None else {}
         self.headers = headers
         if isinstance(payload, bytes):
             payload = PayloadRef(bytes=payload)

diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
@@ -104,8 +104,7 @@ def _init(*args, **kwargs):
     """
     client = Client(*args, **kwargs)  # type: ignore
     Hub.current.bind_client(client)
-    rv = _InitGuard(client)
-    return rv
+    return _InitGuard(client)
 
 
 from sentry_sdk._types import MYPY
@@ -362,11 +361,7 @@ def capture_exception(
         client = self.client
         if client is None:
             return None
-        if error is not None:
-            exc_info = exc_info_from_error(error)
-        else:
-            exc_info = sys.exc_info()
-
+        exc_info = exc_info_from_error(error) if error is not None else sys.exc_info()
         event, hint = event_from_exception(exc_info, client_options=client.options)
         try:
             return self.capture_event(event, hint=hint, scope=scope, **scope_args)
@@ -458,13 +453,13 @@ def start_span(
                 "Deprecated: use start_transaction to start transactions and "
                 "Transaction.start_child to start spans."
             )
-            if isinstance(span, Transaction):
-                logger.warning(deprecation_msg)
-                return self.start_transaction(span)
-            if "transaction" in kwargs:
-                logger.warning(deprecation_msg)
-                name = kwargs.pop("transaction")
-                return self.start_transaction(name=name, **kwargs)
+        if isinstance(span, Transaction):
+            logger.warning(deprecation_msg)
+            return self.start_transaction(span)
+        if "transaction" in kwargs:
+            logger.warning(deprecation_msg)
+            name = kwargs.pop("transaction")
+            return self.start_transaction(name=name, **kwargs)
 
         if span is not None:
             return span
@@ -700,8 +695,7 @@ def iter_trace_propagation_headers(self, span=None):
         if not propagate_traces:
             return
 
-        for header in span.iter_headers():
-            yield header
+        yield from span.iter_headers()
 
 
 GLOBAL_HUB = Hub()

diff --git a/sentry_sdk/integrations/__init__.py b/sentry_sdk/integrations/__init__.py
@@ -92,9 +92,11 @@ def setup_integrations(
     `with_defaults` is set to `True` then all default integrations are added
     unless they were already provided before.
     """
-    integrations = dict(
-        (integration.identifier, integration) for integration in integrations or ()
-    )
+    integrations = {
+        integration.identifier: integration
+        for integration in integrations or ()
+    }
+
 
     logger.debug("Setting up integrations (with default = %s)", with_defaults)
 
@@ -119,15 +121,14 @@ def setup_integrations(
                 try:
                     type(integration).setup_once()
                 except NotImplementedError:
-                    if getattr(integration, "install", None) is not None:
-                        logger.warning(
-                            "Integration %s: The install method is "
-                            "deprecated. Use `setup_once`.",
-                            identifier,
-                        )
-                        integration.install()
-                    else:
+                    if getattr(integration, "install", None) is None:
                         raise
+                    logger.warning(
+                        "Integration %s: The install method is "
+                        "deprecated. Use `setup_once`.",
+                        identifier,
+                    )
+                    integration.install()
                 except DidNotEnable as e:
                     if identifier not in used_as_default_integration:
                         raise

diff --git a/sentry_sdk/integrations/asgi.py b/sentry_sdk/integrations/asgi.py
@@ -88,10 +88,7 @@ def __init__(self, app, unsafe_context_data=False):
             )
         self.app = app
 
-        if _looks_like_asgi3(app):
-            self.__call__ 
F438
= self._run_asgi3  # type: Callable[..., Any]
-        else:
-            self.__call__ = self._run_asgi2
+        self.__call__ = self._run_asgi3 if _looks_like_asgi3(app) else self._run_asgi2
 
     def _run_asgi2(self, scope):
         # type: (Any) -> Any
@@ -252,8 +249,5 @@ def _get_headers(self, scope):
         for raw_key, raw_value in scope["headers"]:
             key = raw_key.decode("latin-1")
             value = raw_value.decode("latin-1")
-            if key in headers:
-                headers[key] = headers[key] + ", " + value
-            else:
-                headers[key] = value
+            headers[key] = headers[key] + ", " + value if key in headers else value
         return headers
diff --git a/sentry_sdk/integrations/aws_lambda.py b/sentry_sdk/integrations/aws_lambda.py
@@ -360,11 +360,10 @@ def event_processor(sentry_event, hint, start_time=start_time):
 
             if "body" in aws_event:
                 request["data"] = aws_event.get("body", "")
-        else:
-            if aws_event.get("body", None):
-                # Unfortunately couldn't find a way to get structured body from AWS
-                # event. Meaning every body is unstructured to us.
-                request["data"] = AnnotatedValue("", {"rem": [["!raw", "x", 0, 0]]})
+        elif aws_event.get("body", None):
+            # Unfortunately couldn't find a way to get structured body from AWS
+            # event. Meaning every body is unstructured to us.
+            request["data"] = AnnotatedValue("", {"rem": [["!raw", "x", 0, 0]]})
 
         sentry_event["request"] = request
 
@@ -402,7 +401,7 @@ def _get_cloudwatch_logs_url(aws_context, start_time):
     formatstring = "%Y-%m-%dT%H:%M:%SZ"
     region = environ.get("AWS_REGION", "")
 
-    url = (
+    return (
         "https://console.{domain}/cloudwatch/home?region={region}"
         "#logEventViewer:group={log_group};stream={log_stream}"
         ";start={start_time};end={end_time}"
@@ -414,5 +413,3 @@ def _get_cloudwatch_logs_url(aws_context, start_time):
         start_time=(start_time - timedelta(seconds=1)).strftime(formatstring),
         end_time=(datetime.utcnow() + timedelta(seconds=2)).strftime(formatstring),
     )
-
-    return url
diff --git a/sentry_sdk/integrations/celery.py b/sentry_sdk/integrations/celery.py
@@ -95,27 +95,26 @@ def apply_async(*args, **kwargs):
         # type: (*Any, **Any) -> Any
         hub = Hub.current
         integration = hub.get_integration(CeleryIntegration)
-        if integration is not None and integration.propagate_traces:
-            with hub.start_span(op="celery.submit", description=args[0].name) as span:
-                with capture_internal_exceptions():
-                    headers = dict(hub.iter_trace_propagation_headers(span))
-
-                    if headers:
-                        # Note: kwargs can contain headers=None, so no setdefault!
-                        # Unsure which backend though.
-                        kwarg_headers = kwargs.get("headers") or {}
-                        kwarg_headers.update(headers)
-
-                        # https://github.com/celery/celery/issues/4875
-                        #
-                        # Need to setdefault the inner headers too since other
-                        # tracing tools (dd-trace-py) also employ this exact
-                        # workaround and we don't want to break them.
-                        kwa
10000
rg_headers.setdefault("headers", {}).update(headers)
-                        kwargs["headers"] = kwarg_headers
+        if integration is None or not integration.propagate_traces:
+            return f(*args, **kwargs)
+        with hub.start_span(op="celery.submit", description=args[0].name) as span:
+            with capture_internal_exceptions():
+                headers = dict(hub.iter_trace_propagation_headers(span))
+
+                if headers:
+                    # Note: kwargs can contain headers=None, so no setdefault!
+                    # Unsure which backend though.
+                    kwarg_headers = kwargs.get("headers") or {}
+                    kwarg_headers.update(headers)
+
+                    # https://github.com/celery/celery/issues/4875
+                    #
+                    # Need to setdefault the inner headers too since other
+                    # tracing tools (dd-trace-py) also employ this exact
+                    # workaround and we don't want to break them.
+                    kwarg_headers.setdefault("headers", {}).update(headers)
+                    kwargs["headers"] = kwarg_headers
 
-                return f(*args, **kwargs)
-        else:
             return f(*args, **kwargs)
 
     return apply_async  # type: ignore

diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
@@ -266,7 +266,6 @@ def sentry_patched_drf_initial(self, request, *args, **kwargs):
                         request._request._sentry_drf_request_backref = weakref.ref(
                             request
                         )
-                        pass
                     return old_drf_initial(self, request, *args, **kwargs)
 
                 APIView.initial = sentry_patched_drf_initial

diff --git a/sentry_sdk/integrations/django/templates.py b/sentry_sdk/integrations/django/templates.py
@@ -43,12 +43,10 @@ def get_template_frame_from_exception(exc_value):
 
 
 def _get_template_name_description(template_name):
-    # type: (str) -> str
-    if isinstance(template_name, (list, tuple)):
-        if template_name:
-            return "[{}, ...]".format(template_name[0])
-    else:
+    if not isinstance(template_name, (list, tuple)):
         return template_name
+    if template_name:
+        return "[{}, ...]".format(template_name[0])
 
 
 def patch_templates():

diff --git a/sentry_sdk/integrations/falcon.py b/sentry_sdk/integrations/falcon.py
@@ -143,11 +143,7 @@ def sentry_patched_handle_exception(self, *args):
         # NOTE(jmagnusson): falcon 2.0 changed falcon.API._handle_exception
         # method signature from `(ex, req, resp, params)` to
         # `(req, resp, ex, params)`
-        if isinstance(args[0], Exception):
-            ex = args[0]
-        else:
-            ex = args[2]
-
+        ex = args[0] if isinstance(args[0], Exception) else args[2]
         was_handled = original_handle_exception(self, *args)
 
         hub = Hub.current

diff --git a/sentry_sdk/integrations/gcp.py b/sentry_sdk/integrations/gcp.py
@@ -77,9 +77,7 @@ def sentry_func(functionhandler, gcp_event, *args, **kwargs):
                     # Starting the thread to raise timeout warning exception
                     timeout_thread.start()
 
-            headers = {}
-            if hasattr(gcp_event, "headers"):
-                headers = gcp_event.headers
+            headers = gcp_event.headers if hasattr(gcp_event, "headers") else {}
             transaction = Transaction.continue_from_headers(
                 headers, op="serverless.function", name=environ.get("FUNCTION_NAME", "")
             )
@@ -183,11 +181,10 @@ def event_processor(event, hint):
         if _should_send_default_pii():
             if hasattr(gcp_event, "data"):
                 request["data"] = gcp_event.data
-        else:
-            if hasattr(gcp_event,
4E34
 "data"):
-                # Unfortunately couldn't find a way to get structured body from GCP
-                # event. Meaning every body is unstructured to us.
-                request["data"] = AnnotatedValue("", {"rem": [["!raw", "x", 0, 0]]})
+        elif hasattr(gcp_event, "data"):
+            # Unfortunately couldn't find a way to get structured body from GCP
+            # event. Meaning every body is unstructured to us.
+            request["data"] = AnnotatedValue("", {"rem": [["!raw", "x", 0, 0]]})
 
         event["request"] = request
 
@@ -208,7 +205,7 @@ def _get_google_cloud_logs_url(final_time):
     hour_ago = final_time - timedelta(hours=1)
     formatstring = "%Y-%m-%dT%H:%M:%SZ"
 
-    url = (
+    return (
         "https://console.cloud.google.com/logs/viewer?project={project}&resource=cloud_function"
         "%2Ffunction_name%2F{function_name}%2Fregion%2F{region}&minLogLevel=0&expandAll=false"
         "&timestamp={timestamp_end}&customFacets=&limitCustomFacetWidth=true"
@@ -221,5 +218,3 @@ def _get_google_cloud_logs_url(final_time):
         timestamp_end=final_time.strftime(formatstring),
         timestamp_start=hour_ago.strftime(formatstring),
     )
-
-    return url
diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py
@@ -100,10 +100,7 @@ def sentry_patched_callhandlers(self, record):
 def _can_record(record):
     # type: (LogRecord) -> bool
     """Prevents ignored loggers from recording"""
-    for logger in _IGNORED_LOGGERS:
-        if fnmatch(record.name, logger):
-            return False
-    return True
+    return not any(fnmatch(record.name, logger) for logger in _IGNORED_LOGGERS)
 
 
 def _breadcrumb_from_record(record):
@@ -199,7 +196,7 @@ def _emit(self, record):
                 client_options=client_options,
                 mechanism={"type": "logging", "handled": True},
             )
-        elif record.exc_info and record.exc_info[0] is None:
+        elif record.exc_info:
             event = {}
             hint = {}
             with capture_internal_exceptions():
-Original file line number
+Diff line change
@@ Expand Up @@
                             request._request._sentry_drf_request_backref = weakref.ref(
                                 request
                             )
-                            pass
                         return old_drf_initial(self, request, *args, **kwargs)
                     APIView.initial = sentry_patched_drf_initial
@@ Expand Down @@