summaryrefslogtreecommitdiff
path: root/mwctools.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2019-07-14 10:10:27 +0200
committerJörg Frings-Fürst <debian@jff.email>2019-07-14 10:10:27 +0200
commit85a84567ef0c2f0949953d81929ce7794fbcad2d (patch)
treeda63e80e3ea0d9e0d4a45e60e75960ffb58b1835 /mwctools.py
parent5b672f2e2521b0f0e932c9b3d76b1f2db27c7201 (diff)
parent4fa0bf4b0c3644078fb9b5c3e7f604f6f6e442d2 (diff)
Update upstream source from tag 'upstream/2.0.5'
Update to upstream version '2.0.5' with Debian dir da8d3ecbd521f52ac641e3c966f4a5e22b64aaeb
Diffstat (limited to 'mwctools.py')
-rwxr-xr-xmwctools.py7
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