From 924be741d85fc6f01171b73efbab3c58470de41d Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Wed, 15 Jan 2020 14:42:56 -0800 Subject: [PATCH 1/2] Moved import of settings so doc build can pass --- .../botbuilder/applicationinsights/django/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/django/common.py b/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/django/common.py index a7f61588c..5e0dbdb38 100644 --- a/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/django/common.py +++ b/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/django/common.py @@ -11,7 +11,6 @@ SynchronousQueue, TelemetryChannel, ) -from django.conf import settings from ..processor.telemetry_processor import TelemetryProcessor from .django_telemetry_processor import DjangoTelemetryProcessor @@ -34,6 +33,7 @@ def load_settings(): + from django.conf import settings # pylint: disable=import-outside-toplevel if hasattr(settings, "APPLICATION_INSIGHTS"): config = settings.APPLICATION_INSIGHTS elif hasattr(settings, "APPLICATIONINSIGHTS"): From 8dc61b6f06cfe652550d256b4c69b62b71099121 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Wed, 15 Jan 2020 14:43:42 -0800 Subject: [PATCH 2/2] Moved import of settings so doc build can pass --- .../botbuilder/applicationinsights/django/common.py | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/django/common.py b/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/django/common.py index 5e0dbdb38..0479b3e22 100644 --- a/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/django/common.py +++ b/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/django/common.py @@ -34,6 +34,7 @@ def load_settings(): from django.conf import settings # pylint: disable=import-outside-toplevel + if hasattr(settings, "APPLICATION_INSIGHTS"): config = settings.APPLICATION_INSIGHTS elif hasattr(settings, "APPLICATIONINSIGHTS"):