Skip to content

Commit ecde8a7

Browse files
Import django.conf.settings instead of ietf.settings. Fixes ietf-tools#3392. Commit ready for merge.
- Legacy-Id: 19788
1 parent 91c46ed commit ecde8a7

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

ietf/meeting/tests_js.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
from django.db.models import F
1616
import pytz
1717

18+
from django.conf import settings
1819
from django.test.utils import override_settings
1920

2021
import debug # pyflakes:ignore
@@ -35,7 +36,6 @@
3536
from ietf.utils.test_utils import assert_ical_response_is_valid
3637
from ietf.utils.jstest import ( IetfSeleniumTestCase, ifSeleniumEnabled, selenium_enabled,
3738
presence_of_element_child_by_css_selector )
38-
from ietf import settings
3939

4040
if selenium_enabled():
4141
from selenium.webdriver.common.action_chains import ActionChains

ietf/utils/jstest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Copyright The IETF Trust 2014-2021, All Rights Reserved
22
# -*- coding: utf-8 -*-
33

4+
from django.conf import settings
45
from django.urls import reverse as urlreverse
56
from unittest import skipIf
67

@@ -19,7 +20,6 @@
1920

2021
from ietf.utils.pipe import pipe
2122
from ietf.utils.test_runner import IetfLiveServerTestCase
22-
from ietf import settings
2323

2424
executable_name = 'chromedriver'
2525
code, out, err = pipe('{} --version'.format(executable_name))

0 commit comments

Comments
 (0)