wkhtmltopdf() uses subprocess.check_output() instead of a custom Popen call.

2 files changed, 49 insertions, 11 deletions

diff --git a/wkhtmltopdf/subprocess.py b/wkhtmltopdf/subprocess.py
new file mode 100644
index 0000000..d0abacd
--- /dev/null
+++ b/wkhtmltopdf/subprocess.py
@@ -0,0 +1,44 @@
+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
diff --git a/wkhtmltopdf/utils.py b/wkhtmltopdf/utils.py
index cf01f43..7994a39 100644
--- a/wkhtmltopdf/utils.py
+++ b/wkhtmltopdf/utils.py
@@ -1,11 +1,14 @@
+from __future__ import absolute_import
+
 from os import fdopen
-from subprocess import Popen, PIPE, CalledProcessError
 from tempfile import mkstemp
 
 from django.conf import settings
 from django.template import loader
 from django.utils.encoding import smart_str
 
+from .subprocess import check_output
+
 WKHTMLTOPDF_CMD = getattr(settings, 'WKHTMLTOPDF_CMD', 'wkhtmltopdf')
 
 def wkhtmltopdf(pages, output=None, **kwargs):
@@ -45,17 +48,8 @@ def wkhtmltopdf(pages, output=None, **kwargs):
 
     kwargs['quiet'] = ''
     args = '%s %s %s %s' % (WKHTMLTOPDF_CMD, _extra_args(**kwargs), ' '.join(pages), output or '-')
+    return check_output(args, shell=True)
 
-    process = Popen(args, stdout=PIPE, shell=True)
-    stdoutdata, stderrdata = process.communicate()
-
-    if process.returncode != 0:
-        raise CalledProcessError(process.returncode, args)
-
-    if output is None:
-        output = stdoutdata
-
-    return output
 
 def template_to_temp_file(template_name, dictionary=None, context_instance=None):
     """