From 1d76b532157c8a36d624052b05fdb599dd042e92 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Tue, 4 Jan 2022 16:09:27 +0000 Subject: [PATCH] Merged in [19788] from jennifer@painless-security.com: Import django.conf.settings instead of ietf.settings. Fixes #3392. - Legacy-Id: 19798 Note: SVN reference [19788] has been migrated to Git commit ecde8a780fce609efc6539e258e57752a03aa2bd --- ietf/meeting/tests_js.py | 2 +- ietf/utils/jstest.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ietf/meeting/tests_js.py b/ietf/meeting/tests_js.py index b7b038988..fa8ffe6d6 100644 --- a/ietf/meeting/tests_js.py +++ b/ietf/meeting/tests_js.py @@ -15,6 +15,7 @@ from django.utils.timezone import now from django.db.models import F import pytz +from django.conf import settings from django.test.utils import override_settings import debug # pyflakes:ignore @@ -35,7 +36,6 @@ from ietf.meeting.utils import add_event_info_to_session_qs from ietf.utils.test_utils import assert_ical_response_is_valid from ietf.utils.jstest import ( IetfSeleniumTestCase, ifSeleniumEnabled, selenium_enabled, presence_of_element_child_by_css_selector ) -from ietf import settings if selenium_enabled(): from selenium.webdriver.common.action_chains import ActionChains diff --git a/ietf/utils/jstest.py b/ietf/utils/jstest.py index f7671f270..47ea91dd2 100644 --- a/ietf/utils/jstest.py +++ b/ietf/utils/jstest.py @@ -1,6 +1,7 @@ # Copyright The IETF Trust 2014-2021, All Rights Reserved # -*- coding: utf-8 -*- +from django.conf import settings from django.urls import reverse as urlreverse from unittest import skipIf @@ -19,7 +20,6 @@ except ImportError as e: from ietf.utils.pipe import pipe from ietf.utils.test_runner import IetfLiveServerTestCase -from ietf import settings executable_name = 'chromedriver' code, out, err = pipe('{} --version'.format(executable_name))