summaryrefslogtreecommitdiff
path: root/alot/widgets
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2017-08-03 14:34:55 -0700
committerDylan Baker <dylan@pnwbakers.com>2017-08-03 14:34:55 -0700
commit037f223debd0aabfab3e2aad880765764f973d31 (patch)
treefe9b094cd1a75355644ec860a48e5239c86afc3e /alot/widgets
parent827c9c0b78840048904883611a0c99bfa77b1725 (diff)
settings: do not store SettingsManager instance in __init__.py
This can create circular imports in unittests, which causes difficult to debug errors. Fixes #1076
Diffstat (limited to 'alot/widgets')
-rw-r--r--alot/widgets/globals.py2
-rw-r--r--alot/widgets/search.py2
-rw-r--r--alot/widgets/thread.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/alot/widgets/globals.py b/alot/widgets/globals.py
index 95b55465..6756149d 100644
--- a/alot/widgets/globals.py
+++ b/alot/widgets/globals.py
@@ -13,7 +13,7 @@ import operator
import urwid
from ..helper import string_decode
-from ..settings import settings
+from ..settings.const import settings
from ..db.attachment import Attachment
from ..errors import CompletionError
diff --git a/alot/widgets/search.py b/alot/widgets/search.py
index 32a078c7..905887cc 100644
--- a/alot/widgets/search.py
+++ b/alot/widgets/search.py
@@ -8,7 +8,7 @@ from __future__ import absolute_import
import urwid
-from ..settings import settings
+from ..settings.const import settings
from ..helper import shorten_author_string
from .utils import AttrFlipWidget
from .globals import TagWidget
diff --git a/alot/widgets/thread.py b/alot/widgets/thread.py
index 1635d52d..31b89e9b 100644
--- a/alot/widgets/thread.py
+++ b/alot/widgets/thread.py
@@ -12,7 +12,7 @@ from urwidtrees import Tree, SimpleTree, CollapsibleTree
from .globals import TagWidget
from .globals import AttachmentWidget
-from ..settings import settings
+from ..settings.const import settings
from ..db.utils import decode_header, X_SIGNATURE_MESSAGE_HEADER
from ..db.utils import extract_body