Author: aconway
Date: Tue Feb 10 16:15:45 2015
New Revision: 1658749
URL: http://svn.apache.org/r1658749
Log:
NO-JIRA: Fix error handling bug in check_output for old python
Modified:
qpid/dispatch/trunk/python/qpid_dispatch_internal/compat/subproc.py
Modified: qpid/dispatch/trunk/python/qpid_dispatch_internal/compat/subproc.py
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch_internal/compat/subproc.py?rev=1658749&r1=1658748&r2=1658749&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch_internal/compat/subproc.py
(original)
+++ qpid/dispatch/trunk/python/qpid_dispatch_internal/compat/subproc.py Tue Feb
10 16:15:45 2015
@@ -33,10 +33,10 @@ except ImportError:
@return: stdout of command (mixed with stderr if stderr=STDOUT)
@raise L{CalledProcessError}: If command returns non-0 exit status.
"""
- if "stdoutxo" in kwargs:
+ if "stdout" in kwargs:
raise ValueError("Must not specify stdout in check_output")
p = Popen(args, stdout=PIPE, stdin=stdin, stderr=stderr, shell=shell,
universal_newlines=universal_newlines, **kwargs)
out, err = p.communicate()
if p.returncode:
- raise CalledProcessError(args, p.returncode, err or out)
+ raise CalledProcessError(args, p.returncode)
return out
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
