From 45eab831e2ad1f3f73560527ed5f618bfb62177f Mon Sep 17 00:00:00 2001 From: mattack108 Date: Fri, 20 Sep 2013 11:39:46 +0100 Subject: Fix tests for Travis by obtaining the WKHTMLTOPDF_CMD from env vars. --- wkhtmltopdf/utils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'wkhtmltopdf') diff --git a/wkhtmltopdf/utils.py b/wkhtmltopdf/utils.py index be6bc6a..1b74a97 100644 --- a/wkhtmltopdf/utils.py +++ b/wkhtmltopdf/utils.py @@ -1,7 +1,6 @@ from __future__ import absolute_import from copy import copy -from functools import wraps from itertools import chain import os import re @@ -80,7 +79,9 @@ def wkhtmltopdf(pages, output=None, **kwargs): if env is not None: env = dict(os.environ, **env) - cmd = getattr(settings, 'WKHTMLTOPDF_CMD', 'wkhtmltopdf') + cmd = 'WKHTMLTOPDF_CMD' + cmd = getattr(settings, cmd, os.environ.get(cmd, 'wkhtmltopdf')) + ck_args = list(chain(cmd.split(), _options_to_args(**options), list(pages), -- cgit v1.2.3