Skip to content

Only use stderr as str after getting non-zero exit code #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alanhamlett merged 3 commits into from
May 4, 2017
Merged

Only use stderr as str after getting non-zero exit code #81

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bac0816
only treat stderr as text after getting non-zero exit code, otherwise…
alanhamlett May 4, 2017
d667a33
decode stderr before writing to stdout
alanhamlett May 4, 2017
438b9b7
catch OSError in case output file does not exist
alanhamlett May 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions pdfkit/pdfkit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down