Skip to content

Commit

Permalink
Merge pull request #4 from mickael-mounier/fix-python2-CalledProcessE…
Browse files Browse the repository at this point in the history
…rror-None-output

Fix Python2 CalledProcessError exception unhandled None value
  • Loading branch information
AndreLouisCaron committed Mar 10, 2017
2 parents eda0b29 + 89d24e1 commit b27f1f5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/pytest_docker/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def execute(command, success_codes=(0,)):
)
status = 0
except subprocess.CalledProcessError as error:
output = error.output
output = error.output or b''
status = error.returncode
command = error.cmd
output = output.decode('utf-8')
Expand Down

0 comments on commit b27f1f5

Please sign in to comment.