diff options
| -rw-r--r-- | README.rst | 6 | ||||
| -rwxr-xr-x | before_script.sh | 12 | ||||
| -rw-r--r-- | wkhtmltopdf/test_settings.py | 2 | ||||
| -rw-r--r-- | wkhtmltopdf/utils.py | 5 |
4 files changed, 16 insertions, 9 deletions
@@ -29,7 +29,7 @@ Run ``pip install django-wkhtmltopdf``. Add ``'wkhtmltopdf'`` to ``INSTALLED_APPS`` in your ``settings.py``. -By default it will execute the first wkhtmltopdf command found on your ``PATH``. +By default it will execute the first ``wkhtmltopdf`` command found on your ``PATH``. If you can't add wkhtmltopdf to your ``PATH``, you can set ``WKHTMLTOPDF_CMD`` to a specific execuatable: @@ -38,6 +38,10 @@ e.g.: in ``settings.py``:: WKHTMLTOPDF_CMD = '/path/to/my/wkhtmltopdf' +or alternatively as env variable:: + + export WKHTMLTOPDF_CMD=/path/to/my/wkhtmltopdf + You may also set ``WKHTMLTOPDF_CMD_OPTIONS`` in ``settings.py`` to a dictionary of default command-line options. diff --git a/before_script.sh b/before_script.sh index ed0b6b4..bde2c4e 100755 --- a/before_script.sh +++ b/before_script.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -sudo aptitude install -y openssl build-essential xorg libssl-dev -wget http://wkhtmltopdf.googlecode.com/files/wkhtmltopdf-0.11.0_rc1-static-i386.tar.bz2 -tar xvjf wkhtmltopdf-0.11.0_rc1-static-i386.tar.bz2 -sudo chown root:root wkhtmltopdf-i386 -sudo mv wkhtmltopdf-i386 /usr/bin/wkhtmltopdf -export WKHTMLTOPDF=/usr/bin/wkhtmltopdf +sudo apt-get install -y openssl build-essential xorg libssl-dev +wget http://wkhtmltopdf.googlecode.com/files/wkhtmltopdf-0.11.0_rc1-static-amd64.tar.bz2 +tar xvjf wkhtmltopdf-0.11.0_rc1-static-amd64.tar.bz2 +sudo chown root:root wkhtmltopdf-amd64 +sudo mv wkhtmltopdf-amd64 /usr/bin/wkhtmltopdf +export WKHTMLTOPDF_CMD=/usr/bin/wkhtmltopdf diff --git a/wkhtmltopdf/test_settings.py b/wkhtmltopdf/test_settings.py index 9f6e461..16fb734 100644 --- a/wkhtmltopdf/test_settings.py +++ b/wkhtmltopdf/test_settings.py @@ -4,6 +4,8 @@ DEBUG = True DIRNAME = os.path.abspath(os.path.dirname(__file__)) +SECRET_KEY = 'fooooooo' + DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', 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), |