diff options
| -rw-r--r-- | alot/__main__.py | 2 | ||||
| -rw-r--r-- | alot/buffers.py | 2 | ||||
| -rw-r--r-- | alot/commands/__init__.py | 2 | ||||
| -rw-r--r-- | alot/commands/envelope.py | 2 | ||||
| -rw-r--r-- | alot/commands/globals.py | 2 | ||||
| -rw-r--r-- | alot/commands/thread.py | 2 | ||||
| -rw-r--r-- | alot/completion.py | 2 | ||||
| -rw-r--r-- | alot/db/envelope.py | 2 | ||||
| -rw-r--r-- | alot/db/manager.py | 2 | ||||
| -rw-r--r-- | alot/db/message.py | 2 | ||||
| -rw-r--r-- | alot/db/thread.py | 2 | ||||
| -rw-r--r-- | alot/db/utils.py | 2 | ||||
| -rw-r--r-- | alot/settings/__init__.py | 8 | ||||
| -rw-r--r-- | alot/settings/const.py | 8 | ||||
| -rw-r--r-- | alot/ui.py | 2 | ||||
| -rw-r--r-- | alot/widgets/globals.py | 2 | ||||
| -rw-r--r-- | alot/widgets/search.py | 2 | ||||
| -rw-r--r-- | alot/widgets/thread.py | 2 |
18 files changed, 24 insertions, 24 deletions
diff --git a/alot/__main__.py b/alot/__main__.py index aba380ba..9b741641 100644 --- a/alot/__main__.py +++ b/alot/__main__.py @@ -9,7 +9,7 @@ import os import sys import alot -from alot.settings import settings +from alot.settings.const import settings from alot.settings.errors import ConfigError from alot.db.manager import DBManager from alot.ui import UI diff --git a/alot/buffers.py b/alot/buffers.py index 09cf1fe8..6641bd2e 100644 --- a/alot/buffers.py +++ b/alot/buffers.py @@ -10,7 +10,7 @@ import urwid from urwidtrees import ArrowTree, TreeBox, NestedTree from notmuch import NotmuchError -from .settings import settings +from .settings.const import settings from . import commands from .walker import PipeWalker from .helper import shorten_author_string diff --git a/alot/commands/__init__.py b/alot/commands/__init__.py index 6b84a50b..351fc993 100644 --- a/alot/commands/__init__.py +++ b/alot/commands/__init__.py @@ -9,7 +9,7 @@ import logging import os import re -from ..settings import settings +from ..settings.const import settings from ..helper import split_commandstring, string_decode diff --git a/alot/commands/envelope.py b/alot/commands/envelope.py index 9fa8fac3..a9cfac74 100644 --- a/alot/commands/envelope.py +++ b/alot/commands/envelope.py @@ -26,7 +26,7 @@ from ..db.errors import DatabaseError from ..errors import GPGProblem from ..helper import email_as_string from ..helper import string_decode -from ..settings import settings +from ..settings.const import settings from ..settings.errors import NoMatchingAccount from ..utils import argparse as cargparse diff --git a/alot/commands/globals.py b/alot/commands/globals.py index 8e8c4fde..7c590802 100644 --- a/alot/commands/globals.py +++ b/alot/commands/globals.py @@ -34,7 +34,7 @@ from ..completion import TagsCompleter from ..widgets.utils import DialogBox from ..db.errors import DatabaseLockedError from ..db.envelope import Envelope -from ..settings import settings +from ..settings.const import settings from ..utils import argparse as cargparse MODE = 'global' diff --git a/alot/commands/thread.py b/alot/commands/thread.py index ce5da649..0c23b037 100644 --- a/alot/commands/thread.py +++ b/alot/commands/thread.py @@ -31,7 +31,7 @@ from ..db.utils import extract_body from ..db.envelope import Envelope from ..db.attachment import Attachment from ..db.errors import DatabaseROError -from ..settings import settings +from ..settings.const import settings from ..helper import parse_mailcap_nametemplate from ..helper import split_commandstring from ..helper import email_as_string diff --git a/alot/completion.py b/alot/completion.py index 69e622eb..5d0b132e 100644 --- a/alot/completion.py +++ b/alot/completion.py @@ -14,7 +14,7 @@ import re from . import crypto from . import commands from .buffers import EnvelopeBuffer -from .settings import settings +from .settings.const import settings from .utils import argparse as cargparse from .helper import split_commandline from .addressbook import AddressbookError diff --git a/alot/db/envelope.py b/alot/db/envelope.py index 2a67a79c..0a6d4f58 100644 --- a/alot/db/envelope.py +++ b/alot/db/envelope.py @@ -21,7 +21,7 @@ from .utils import encode_header from .. import __version__ from .. import helper from .. import crypto -from ..settings import settings +from ..settings.const import settings from ..errors import GPGProblem, GPGCode charset.add_charset('utf-8', charset.QP, charset.QP, 'utf-8') diff --git a/alot/db/manager.py b/alot/db/manager.py index cd0c5073..ab5785eb 100644 --- a/alot/db/manager.py +++ b/alot/db/manager.py @@ -23,7 +23,7 @@ from .errors import NonexistantObjectError from .message import Message from .thread import Thread from .utils import is_subdir_of -from ..settings import settings +from ..settings.const import settings class FillPipeProcess(multiprocessing.Process): diff --git a/alot/db/message.py b/alot/db/message.py index 14d0eb81..747321be 100644 --- a/alot/db/message.py +++ b/alot/db/message.py @@ -14,7 +14,7 @@ from .utils import extract_body, message_from_file from .utils import decode_header from .attachment import Attachment from .. import helper -from ..settings import settings +from ..settings.const import settings charset.add_charset('utf-8', charset.QP, charset.QP, 'utf-8') diff --git a/alot/db/thread.py b/alot/db/thread.py index 619558b6..69b81870 100644 --- a/alot/db/thread.py +++ b/alot/db/thread.py @@ -6,7 +6,7 @@ from __future__ import absolute_import from datetime import datetime from .message import Message -from ..settings import settings +from ..settings.const import settings class Thread(object): diff --git a/alot/db/utils.py b/alot/db/utils.py index 3cad7dd2..3cff108a 100644 --- a/alot/db/utils.py +++ b/alot/db/utils.py @@ -18,7 +18,7 @@ from cStringIO import StringIO from .. import crypto from .. import helper from ..errors import GPGProblem -from ..settings import settings +from ..settings.const import settings from ..helper import string_sanitize from ..helper import string_decode from ..helper import parse_mailcap_nametemplate diff --git a/alot/settings/__init__.py b/alot/settings/__init__.py index 11137d1d..e69de29b 100644 --- a/alot/settings/__init__.py +++ b/alot/settings/__init__.py @@ -1,8 +0,0 @@ -# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com> -# This file is released under the GNU GPL, version 3 or a later revision. -# For further details see the COPYING file -from __future__ import absolute_import - -from .manager import SettingsManager - -settings = SettingsManager() diff --git a/alot/settings/const.py b/alot/settings/const.py new file mode 100644 index 00000000..11137d1d --- /dev/null +++ b/alot/settings/const.py @@ -0,0 +1,8 @@ +# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com> +# This file is released under the GNU GPL, version 3 or a later revision. +# For further details see the COPYING file +from __future__ import absolute_import + +from .manager import SettingsManager + +settings = SettingsManager() @@ -10,7 +10,7 @@ import signal from twisted.internet import reactor, defer, task import urwid -from .settings import settings +from .settings.const import settings from .buffers import BufferlistBuffer, SearchBuffer from .commands import globals from .commands import commandfactory 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 |