altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged in [19788] from jennifer@painless-security.com:

Browse source 
Import django.conf.settings instead of ietf.settings. Fixes #3392.
 - Legacy-Id: 19798
Note: SVN reference [19788] has been migrated to Git commit ecde8a780fce609efc6539e258e57752a03aa2bd
This commit is contained in:
Robert Sparks 2022-01-04 16:09:27 +00:00
parent f8770ac9be
commit 1d76b53215
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/meeting/tests_js.py
View file

@ -15,6 +15,7 @@ from django.utils.timezone import now
from django.db.models import F from django.db.models import F
import pytz import pytz
from django.conf import settings
from django.test.utils import override_settings from django.test.utils import override_settings
import debug # pyflakes:ignore 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.test_utils import assert_ical_response_is_valid
from ietf.utils.jstest import ( IetfSeleniumTestCase, ifSeleniumEnabled, selenium_enabled, from ietf.utils.jstest import ( IetfSeleniumTestCase, ifSeleniumEnabled, selenium_enabled,
presence_of_element_child_by_css_selector ) presence_of_element_child_by_css_selector )
from ietf import settings
if selenium_enabled(): if selenium_enabled():
from selenium.webdriver.common.action_chains import ActionChains from selenium.webdriver.common.action_chains import ActionChains

2
ietf/utils/jstest.py
View file

@ -1,6 +1,7 @@
# Copyright The IETF Trust 2014-2021, All Rights Reserved # Copyright The IETF Trust 2014-2021, All Rights Reserved
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.conf import settings
from django.urls import reverse as urlreverse from django.urls import reverse as urlreverse
from unittest import skipIf from unittest import skipIf
@ -19,7 +20,6 @@ except ImportError as e:
from ietf.utils.pipe import pipe from ietf.utils.pipe import pipe
from ietf.utils.test_runner import IetfLiveServerTestCase from ietf.utils.test_runner import IetfLiveServerTestCase
from ietf import settings
executable_name = 'chromedriver' executable_name = 'chromedriver'
code, out, err = pipe('{} --version'.format(executable_name)) code, out, err = pipe('{} --version'.format(executable_name))