Fix Python 2.6.x compatibility.

The subprocess module in Python 2.6 has a CalledProcessError class,
but its constructor doesn't take a third (output) argument.  So don't
only pass the constructor two arguments.