Merge pull request JazzCore#81 from alanhamlett/master

alanhamlett · web-flow · commit 8879d7fac44c · 2017-05-04T00:29:25.000-07:00
Only use stderr as str after getting non-zero exit code
diff --git a/pdfkit/pdfkit.py b/pdfkit/pdfkit.py
@@ -140,28 +140,30 @@ def to_pdf(self, path=None):
             input = None
         stdout, stderr = result.communicate(input=input)
         stderr = stderr or stdout
-        try:
-            stderr = stderr.decode('utf-8')
-        except UnicodeDecodeError:
-            stderr = ''
+
         exit_code = result.returncode
+        if exit_code != 0:
+            try:
+                stderr = stderr.decode('utf-8')
+            except UnicodeDecodeError:
+                stderr = ''
 
-        if 'cannot connect to X server' in stderr:
-            raise IOError('%s\n'
-                          'You will need to run wkhtmltopdf within a "virtual" X server.\n'
-                          'Go to the link below for more information\n'
-                          'https://github.com/JazzCore/python-pdfkit/wiki/Using-wkhtmltopdf-without-X-server' % stderr)
+            if 'cannot connect to X server' in stderr:
+                raise IOError('%s\n'
+                            'You will need to run wkhtmltopdf within a "virtual" X server.\n'
+                            'Go to the link below for more information\n'
+                            'https://github.com/JazzCore/python-pdfkit/wiki/Using-wkhtmltopdf-without-X-server' % stderr)
 
-        if 'Error' in stderr:
-            raise IOError('wkhtmltopdf reported an error:\n' + stderr)
+            if 'Error' in stderr:
+                raise IOError('wkhtmltopdf reported an error:\n' + stderr)
 
-        if exit_code != 0:
-            raise IOError("wkhtmltopdf exited with non-zero code {0}. error:\n{1}".format(exit_code, stderr))
+            error_msg = stderr or 'Unknown Error'
+            raise IOError("wkhtmltopdf exited with non-zero code {0}. error:\n{1}".format(exit_code, error_msg))
 
         # Since wkhtmltopdf sends its output to stderr we will capture it
         # and properly send to stdout
         if '--quiet' not in args:
-            sys.stdout.write(stderr)
+            sys.stdout.write(stderr.decode('utf-8'))
 
         if not path:
             return stdout
@@ -175,7 +177,7 @@ def to_pdf(self, path=None):
                                       'Check whhtmltopdf output without \'quiet\' '
                                       'option' % ' '.join(args))
                     return True
-            except IOError as e:
+            except (IOError, OSError) as e:
                 raise IOError('Command failed: %s\n'
                               'Check whhtmltopdf output without \'quiet\' option\n'
                               '%s ' %(' '.join(args)),e)
