diff options
author | Filipp Lepalaan <filipp@mac.com> | 2017-01-27 15:46:51 +0200 |
---|---|---|
committer | Filipp Lepalaan <filipp@mac.com> | 2017-01-27 15:46:51 +0200 |
commit | f857631011e4ef0642647b44623ffc8bc138d2cc (patch) | |
tree | b7d9af37dd44a00cdf17cb7c0ead0b410213f6fb /wkhtmltopdf/subprocess.py | |
parent | e7aa62484a6cbe89a3eeb155fcc8aef31d615cff (diff) | |
download | django-wkhtmltopdf-f857631011e4ef0642647b44623ffc8bc138d2cc.tar.gz django-wkhtmltopdf-f857631011e4ef0642647b44623ffc8bc138d2cc.tar.bz2 django-wkhtmltopdf-f857631011e4ef0642647b44623ffc8bc138d2cc.zip |
Make ContentNotFoundError optional
Diffstat (limited to 'wkhtmltopdf/subprocess.py')
-rw-r--r-- | wkhtmltopdf/subprocess.py | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/wkhtmltopdf/subprocess.py b/wkhtmltopdf/subprocess.py deleted file mode 100644 index d0abacd..0000000 --- a/wkhtmltopdf/subprocess.py +++ /dev/null @@ -1,44 +0,0 @@ -from __future__ import absolute_import - -from subprocess import * - - -# Provide Python 2.7's check_output() function. -try: - check_output -except NameError: - def check_output(*popenargs, **kwargs): - r"""Run command with arguments and return its output as a byte string. - - If the exit code was non-zero it raises a CalledProcessError. The - CalledProcessError object will have the return code in the returncode - attribute and output in the output attribute. - - The arguments are the same as for the Popen constructor. Example: - - >>> check_output(["ls", "-l", "/dev/null"]) - 'crw-rw-rw- 1 root root 1, 3 Oct 18 2007 /dev/null\n' - - The stdout argument is not allowed as it is used internally. - To capture standard error in the result, use stderr=STDOUT. - - >>> check_output(["/bin/sh", "-c", - ... "ls -l non_existent_file ; exit 0"], - ... stderr=STDOUT) - 'ls: non_existent_file: No such file or directory\n' - """ - if 'stdout' in kwargs: - raise ValueError('stdout argument not allowed, it will be overridden.') - process = Popen(stdout=PIPE, *popenargs, **kwargs) - output, unused_err = process.communicate() - retcode = process.poll() - if retcode: - cmd = kwargs.get("args") - if cmd is None: - cmd = popenargs[0] - error = CalledProcessError(retcode, cmd) - # Add the output attribute to CalledProcessError, which - # doesn't exist until Python 2.7. - error.output = output - raise error - return output |