diff options
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | README.rst | 5 | ||||
| -rw-r--r-- | wkhtmltopdf/utils.py | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 698a5ed..ff19ade 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,11 +18,11 @@ before_install: - PWD=`pwd` - "echo '## Installing dependencies'" - "sudo apt-get update" - - "sudo apt-get install -y openssl build-essential xorg libssl-dev" + - "sudo apt-get install -y openssl build-essential xorg libssl-dev xfonts-75dpi" - "echo '## Downloading wkhtmltopdf 0.12.1'" - - "wget http://freefr.dl.sourceforge.net/project/wkhtmltopdf/0.12.1/wkhtmltox-0.12.1_linux-precise-amd64.deb" + - "wget http://download.gna.org/wkhtmltopdf/0.12/0.12.2.1/wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb" - "echo '## Installing wkhtmltox'" - - "sudo dpkg -i wkhtmltox-0.12.1_linux-precise-amd64.deb" + - "sudo dpkg -i wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb" - WHICH_WK=`which wkhtmltopdf` - "export WKHTMLTOPDF_CMD=$WHICH_WK" install: @@ -58,6 +58,11 @@ The default is: :: 'quiet': True, } +Documentation +------------- + +Documentation is available at http://django-wkhtmltopdf.readthedocs.org/en/latest/. + License ------- diff --git a/wkhtmltopdf/utils.py b/wkhtmltopdf/utils.py index 9c338bf..f9d7ac1 100644 --- a/wkhtmltopdf/utils.py +++ b/wkhtmltopdf/utils.py @@ -5,6 +5,7 @@ from itertools import chain import os import re import sys +import shlex try: from urllib.request import pathname2url @@ -88,7 +89,7 @@ def wkhtmltopdf(pages, output=None, **kwargs): cmd = 'WKHTMLTOPDF_CMD' cmd = getattr(settings, cmd, os.environ.get(cmd, 'wkhtmltopdf')) - ck_args = list(chain(cmd.split(), + ck_args = list(chain(shlex.split(cmd), _options_to_args(**options), list(pages), [output])) |