diff options
| author | Dylan Baker <baker.dylan.c@gmail.com> | 2017-08-17 12:34:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-17 12:34:50 -0700 |
| commit | 188d79a0189b480656542a09be348fcbf506f33d (patch) | |
| tree | ad5b1a09e19056905b020459ce50b50d65e2679b /alot/settings | |
| parent | adc4fbb3595b059ae98b683fe57add578c3c2b86 (diff) | |
| parent | 6d20c4ae8f1130bd29b14ea52014b394e0a1c4a4 (diff) | |
Merge pull request #1095 from dcbaker/submit/use-default-theme-if-no-config
Load default settings even if a user config doesn't exist
Diffstat (limited to 'alot/settings')
| -rw-r--r-- | alot/settings/manager.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/alot/settings/manager.py b/alot/settings/manager.py index 01eec053..6f9273c2 100644 --- a/alot/settings/manager.py +++ b/alot/settings/manager.py @@ -41,7 +41,6 @@ class SettingsManager(object): assert notmuch_rc is None or (isinstance(notmuch_rc, basestring) and os.path.exists(notmuch_rc)) self.hooks = None self._mailcaps = mailcap.getcaps() - self._config = ConfigObj() self._notmuchconfig = None self._theme = None self._accounts = None @@ -69,15 +68,11 @@ class SettingsManager(object): def read_notmuch_config(self): """parse notmuch's config file from path""" - if self.notmuch_rc_path is not None: - spec = os.path.join(DEFAULTSPATH, 'notmuch.rc.spec') - self._notmuchconfig = read_config(self.notmuch_rc_path, spec) + spec = os.path.join(DEFAULTSPATH, 'notmuch.rc.spec') + self._notmuchconfig = read_config(self.notmuch_rc_path, spec) def read_config(self): """parse alot's config file from path""" - if self.alot_rc_path is None: - return - spec = os.path.join(DEFAULTSPATH, 'alot.rc.spec') newconfig = read_config( self.alot_rc_path, spec, checks={ |