From a012b3c1a20855a66777a6ddcc44b3e76e30cb90 Mon Sep 17 00:00:00 2001 From: Armin Ronacher Date: Fri, 31 Aug 2018 14:47:41 +0200 Subject: [PATCH] ref: Refactor integration init --- sentry_sdk/api.py | 3 +-- sentry_sdk/integrations/__init__.py | 19 ++++++++----------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/sentry_sdk/api.py b/sentry_sdk/api.py index 523062f26b..a4c43f55b1 100644 --- a/sentry_sdk/api.py +++ b/sentry_sdk/api.py @@ -19,10 +19,9 @@ def __exit__(self, exc_type, exc_value, tb): def _init_on_hub(hub, args, kwargs): options = get_options(*args, **kwargs) - install = setup_integrations(options) client = Client(options) hub.bind_client(client) - install() + setup_integrations(options) return _InitGuard(client) diff --git a/sentry_sdk/integrations/__init__.py b/sentry_sdk/integrations/__init__.py index 457657ef39..0dba017f07 100644 --- a/sentry_sdk/integrations/__init__.py +++ b/sentry_sdk/integrations/__init__.py @@ -19,19 +19,16 @@ def _get_default_integrations(): def setup_integrations(options): - integrations = list(options.pop("integrations", None) or ()) - default_integrations = options.pop("default_integrations") or False + integrations = list(options.get("integrations", None) or ()) + default_integrations = options.get("default_integrations") or False - def install(): - if default_integrations: - for cls in _get_default_integrations(): - if not any(isinstance(x, cls) for x in integrations): - integrations.append(cls()) + if default_integrations: + for cls in _get_default_integrations(): + if not any(isinstance(x, cls) for x in integrations): + integrations.append(cls()) - for integration in integrations: - integration() - - return install + for integration in integrations: + integration() class Integration(object):