diff options
-rw-r--r-- | alot/account.py | 3 | ||||
-rw-r--r-- | alot/message.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/alot/account.py b/alot/account.py index ce096b28..0404aa82 100644 --- a/alot/account.py +++ b/alot/account.py @@ -8,7 +8,6 @@ import shlex from ConfigParser import SafeConfigParser from urlparse import urlparse -from helper import cmd_output import helper @@ -322,7 +321,7 @@ class MatchSdtoutAddressbook(AddressBook): def lookup(self, prefix): cmdlist = shlex.split(self.command.encode('utf-8', errors='ignore')) - resultstring = cmd_output(cmdlist + [prefix]) + resultstring, errmsg, retval = helper.call_cmd(cmdlist + [prefix]) if not resultstring: return [] lines = resultstring.replace('\t', ' ' * 4).splitlines() diff --git a/alot/message.py b/alot/message.py index 0671a80b..e3ad3940 100644 --- a/alot/message.py +++ b/alot/message.py @@ -278,7 +278,7 @@ def extract_body(mail, types=None): #create and call external command cmd = handler % tmpfile.name cmdlist = shlex.split(cmd.encode('utf-8', errors='ignore')) - rendered_payload = helper.cmd_output(cmdlist) + rendered_payload, errmsg, retval = helper.call_cmd(cmdlist) #remove tempfile os.unlink(tmpfile.name) if rendered_payload: # handler had output |