diff options
| author | Patrick Totzke <patricktotzke@gmail.com> | 2012-08-10 23:29:54 +0100 |
|---|---|---|
| committer | Patrick Totzke <patricktotzke@gmail.com> | 2012-08-10 23:29:54 +0100 |
| commit | a503d77b83ae79dcd5f69c46c557296df5526279 (patch) | |
| tree | cd01df8f29233c8f804c30235210dda52948645a | |
| parent | 80354cbcff7a8150c6d58728c7636f295bc94316 (diff) | |
| parent | 5ef1fe23ab88f27ce3ecf1e3ae90b9d759e18a9d (diff) | |
Merge branch '0.3.2-fix-theming-quirks-494'
| -rw-r--r-- | alot/db/utils.py | 1 | ||||
| -rw-r--r-- | alot/defaults/theme.spec | 2 | ||||
| -rw-r--r-- | alot/settings/utils.py | 4 | ||||
| -rw-r--r-- | alot/widgets/search.py | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/alot/db/utils.py b/alot/db/utils.py index bda6d4be..8f9de4c9 100644 --- a/alot/db/utils.py +++ b/alot/db/utils.py @@ -64,7 +64,6 @@ def extract_body(mail, types=None): body_parts = [] for part in mail.walk(): ctype = part.get_content_type() - logging.debug(ctype) if types is not None: if ctype not in types: diff --git a/alot/defaults/theme.spec b/alot/defaults/theme.spec index 05d59c16..05df2b88 100644 --- a/alot/defaults/theme.spec +++ b/alot/defaults/theme.spec @@ -44,7 +44,7 @@ normal = attrtriple(default=None) focus = attrtriple(default=None) width = widthtuple(default=None) - alignment = align(default='right') + alignment = align(default=None) [thread] arrow_heads = attrtriple arrow_bars = attrtriple diff --git a/alot/settings/utils.py b/alot/settings/utils.py index 6b5f77cb..2647bb75 100644 --- a/alot/settings/utils.py +++ b/alot/settings/utils.py @@ -24,7 +24,9 @@ def read_config(configpath=None, specpath=None, checks={}): try: config = ConfigObj(infile=configpath, configspec=specpath, file_error=True, encoding='UTF8') - except (ConfigObjError, IOError): + except ConfigObjError as e: + raise ConfigError(e) + except IOError: raise ConfigError('Could not read %s' % configpath) except UnboundLocalError: # this works around a bug in configobj diff --git a/alot/widgets/search.py b/alot/widgets/search.py index 6f8ed126..7a301d81 100644 --- a/alot/widgets/search.py +++ b/alot/widgets/search.py @@ -64,7 +64,7 @@ class ThreadlineWidget(urwid.AttrMap): mailcountstring = "(%d)" % self.thread.get_total_messages() else: mailcountstring = "(?)" - datestring = pad(mailcountstring) + mailcountstring = pad(mailcountstring) width = len(mailcountstring) mailcount_w = AttrFlipWidget(urwid.Text(mailcountstring), struct['mailcount']) |