summaryrefslogtreecommitdiff
path: root/alot/settings/manager.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2017-01-25 09:36:23 -0800
committerDylan Baker <dylan@pnwbakers.com>2017-01-25 10:37:20 -0800
commitde85d34545fc8f67b80697a73a2d676b740e9ddd (patch)
tree368c4bf753d9549c0182a8a66035a0429f823530 /alot/settings/manager.py
parent0ec97d98e82d10024419199b93c1d13a1cedc5eb (diff)
move alot/settings/checks to alot/utils/configobj
This is just more reorganization.
Diffstat (limited to 'alot/settings/manager.py')
-rw-r--r--alot/settings/manager.py19
1 files changed, 8 insertions, 11 deletions
diff --git a/alot/settings/manager.py b/alot/settings/manager.py
index 5e9727f8..074622d6 100644
--- a/alot/settings/manager.py
+++ b/alot/settings/manager.py
@@ -14,15 +14,11 @@ from ..account import SendmailAccount
from ..addressbook.abook import AbookAddressBook
from ..addressbook.external import ExternalAddressbook
from ..helper import pretty_datetime, string_decode
+from ..utils import configobj as checks
from .errors import ConfigError
from .utils import read_config
from .utils import resolve_att
-from .checks import force_list
-from .checks import mail_container
-from .checks import gpg_key
-from .checks import attr_triple
-from .checks import align_mode
from .theme import Theme
@@ -60,12 +56,13 @@ class SettingsManager(object):
def read_config(self, path):
"""parse alot's config file from path"""
spec = os.path.join(DEFAULTSPATH, 'alot.rc.spec')
- newconfig = read_config(path, spec,
- checks={'mail_container': mail_container,
- 'force_list': force_list,
- 'align': align_mode,
- 'attrtriple': attr_triple,
- 'gpg_key_hint': gpg_key})
+ newconfig = read_config(
+ path, spec, checks={
+ 'mail_container': checks.mail_container,
+ 'force_list': checks.force_list,
+ 'align': checks.align_mode,
+ 'attrtriple': checks.attr_triple,
+ 'gpg_key_hint': checks.gpg_key})
self._config.merge(newconfig)
hooks_path = os.path.expanduser(self._config.get('hooksfile'))