ComposeCommand: read template/signature as text

We should not try to guess anything, just use the platform encoding.

Remove helper.try_decode(), as it has no more callers.

1 files changed, 8 insertions, 7 deletions

diff --git a/alot/commands/globals.py b/alot/commands/globals.py
index 310a59db..b95d37b9 100644
--- a/alot/commands/globals.py
+++ b/alot/commands/globals.py
@@ -743,8 +743,8 @@ class ComposeCommand(Command):
                       priority='error')
             raise self.ApplyError()
         try:
-            with open(path, 'rb') as f:
-                template = helper.try_decode(f.read())
+            with open(path, 'r') as f:
+                template = f.read()
             self.envelope.parse_template(template)
         except Exception as e:
             ui.notify(str(e), priority='error')
@@ -804,11 +804,12 @@ class ComposeCommand(Command):
                     self.envelope.attach(sig, filename=name)
                     logging.debug('attached')
                 else:
-                    with open(sig, 'rb') as f:
-                        sigcontent = f.read()
-                    mimetype = helper.guess_mimetype(sigcontent)
-                    if mimetype.startswith('text'):
-                        sigcontent = helper.try_decode(sigcontent)
+                    try:
+                        with open(sig, 'r') as f:
+                            sigcontent = f.read()
+                    except UnicodeDecodeError:
+                        ui.notify('Could not read signature', priority = 'error')
+                    else:
                         self.envelope.body += '\n' + sigcontent
             else:
                 ui.notify('could not locate signature: %s' % sig,