diff options
| author | Patrick Totzke <patricktotzke@gmail.com> | 2016-02-21 16:04:12 +0000 |
|---|---|---|
| committer | Patrick Totzke <patricktotzke@gmail.com> | 2016-02-21 16:04:12 +0000 |
| commit | 2b9f3f86f230dbd61eb933199e1ea0bb30df4f11 (patch) | |
| tree | 4ef1c6f14ee330adf37bda0444ffec169bd220ff /alot | |
| parent | 9ad0125dadd475aecc4f30b9a5b883ad52a8f41c (diff) | |
| parent | 7d487d604178e311dbc0994d3c81b95683b2419e (diff) | |
Merge branch '0.3.8-magic-841' into testing
Diffstat (limited to 'alot')
| -rw-r--r-- | alot/helper.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/alot/helper.py b/alot/helper.py index 040467a6..23e2f1f9 100644 --- a/alot/helper.py +++ b/alot/helper.py @@ -397,7 +397,8 @@ def guess_mimetype(blob): m.load() magictype = m.buffer(blob) elif hasattr(magic, 'from_buffer'): - magictype = magic.from_buffer(blob, mime=True) + # cf. issue #841 + magictype = magic.from_buffer(blob, mime=True) or magictype else: raise Exception('Unknown magic API') |