diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2019-07-14 10:14:37 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2019-07-14 10:14:37 +0200 |
commit | ed207aea17489d57b7c5c7471ce355e59ab5d1e1 (patch) | |
tree | df236e320cc4426d9cac204283551a17a9183428 /mwctools.py | |
parent | 5b672f2e2521b0f0e932c9b3d76b1f2db27c7201 (diff) | |
parent | c6476862b6d55d0b434ecbd215941745f956327b (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'mwctools.py')
-rwxr-xr-x | mwctools.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mwctools.py b/mwctools.py index cefbbf0..1dca2e6 100755 --- a/mwctools.py +++ b/mwctools.py @@ -33,12 +33,13 @@ class Receiver(Parser): class Content: - def __init__(self, uri, encoding, title, content, contenttype): + def __init__(self, uri, encoding, title, content, contenttype, additional=None): self.uri = uri self.encoding = encoding self.title = title self.content = content self.contenttype = contenttype + self.additional = additional # returns a short subject line @@ -106,13 +107,13 @@ class CommandReceiver(Receiver): contentList = [] # run command and retrieve output - process = subprocess.Popen(self.command, stdout=subprocess.PIPE, shell=True, close_fds=True) + process = subprocess.Popen(self.command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True, close_fds=True) thefile = process.stdout result = thefile.read().decode(self.encoding, errors='ignore') thefile.close() if process.wait() != 0: - raise Exception("process terminated with an error") + raise Exception("process terminated with an error: " + str(process.stderr) + "\n" + result) contentList.append(Content(uri=None, encoding=self.encoding, title=None, content=result, contenttype=self.contenttype)) return contentList |