Clean up imports

- use relative imports if possible
- group imports into standard library, third party, and alot modules
- sort imports alphabetically

5 files changed, 24 insertions, 24 deletions

diff --git a/alot/settings/__init__.py b/alot/settings/__init__.py
index 57c351b7..b1449c29 100644
--- a/alot/settings/__init__.py
+++ b/alot/settings/__init__.py
@@ -1,6 +1,6 @@
 # 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 alot.settings.manager import SettingsManager
+from .manager import SettingsManager
 
 settings = SettingsManager()
diff --git a/alot/settings/checks.py b/alot/settings/checks.py
index 76d22780..fd44fe66 100644
--- a/alot/settings/checks.py
+++ b/alot/settings/checks.py
@@ -9,8 +9,8 @@ from validate import VdtTypeError
 from validate import is_list
 from validate import ValidateError, VdtValueTooLongError, VdtValueError
 
-from alot import crypto
-from alot.errors import GPGProblem
+from .. import crypto
+from ..errors import GPGProblem
 
 
 def attr_triple(value):
diff --git a/alot/settings/manager.py b/alot/settings/manager.py
index bd810514..1aaffa4f 100644
--- a/alot/settings/manager.py
+++ b/alot/settings/manager.py
@@ -8,20 +8,20 @@ import mailcap
 import logging
 from configobj import ConfigObj, Section
 
-from alot.account import SendmailAccount
-from alot.addressbook.abook import AbookAddressBook
-from alot.addressbook.external import ExternalAddressbook
-from alot.helper import pretty_datetime, string_decode
-
-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
+from ..account import SendmailAccount
+from ..addressbook.abook import AbookAddressBook
+from ..addressbook.external import ExternalAddressbook
+from ..helper import pretty_datetime, string_decode
+
+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
 
 
 DEFAULTSPATH = os.path.join(os.path.dirname(__file__), '..', 'defaults')
diff --git a/alot/settings/theme.py b/alot/settings/theme.py
index 308ec660..0e9ced2a 100644
--- a/alot/settings/theme.py
+++ b/alot/settings/theme.py
@@ -3,12 +3,12 @@
 # For further details see the COPYING file
 import os
 
-from utils import read_config
-from checks import align_mode
-from checks import attr_triple
-from checks import width_tuple
-from checks import force_list
-from errors import ConfigError
+from .utils import read_config
+from .checks import align_mode
+from .checks import attr_triple
+from .checks import width_tuple
+from .checks import force_list
+from .errors import ConfigError
 
 DEFAULTSPATH = os.path.join(os.path.dirname(__file__), '..', 'defaults')
 DUMMYDEFAULT = ('default',) * 6
diff --git a/alot/settings/utils.py b/alot/settings/utils.py
index b6984a7f..f46a8caf 100644
--- a/alot/settings/utils.py
+++ b/alot/settings/utils.py
@@ -3,9 +3,9 @@
 # For further details see the COPYING file
 from configobj import ConfigObj, ConfigObjError, flatten_errors
 from validate import Validator
-from errors import ConfigError
 from urwid import AttrSpec
 
+from .errors import ConfigError
 
 def read_config(configpath=None, specpath=None, checks={}):
     """