diff options
| author | Matt Lenc <mattl@incuna.com> | 2014-06-18 17:11:38 +0100 |
|---|---|---|
| committer | Matt Lenc <mattl@incuna.com> | 2014-06-18 17:11:38 +0100 |
| commit | c66222e8d649ef3d10ca679921c4c6ce8793cddd (patch) | |
| tree | aab3532baab2bf88a2f3c6921b2692de276d989a /wkhtmltopdf/utils.py | |
| parent | b615855f8ca277437dad9c332398e3803c2af41c (diff) | |
| download | django-wkhtmltopdf-c66222e8d649ef3d10ca679921c4c6ce8793cddd.tar.gz django-wkhtmltopdf-c66222e8d649ef3d10ca679921c4c6ce8793cddd.tar.bz2 django-wkhtmltopdf-c66222e8d649ef3d10ca679921c4c6ce8793cddd.zip | |
First try py3k then fall back to python2
Diffstat (limited to 'wkhtmltopdf/utils.py')
| -rw-r--r-- | wkhtmltopdf/utils.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wkhtmltopdf/utils.py b/wkhtmltopdf/utils.py index 9be8f86..e34085d 100644 --- a/wkhtmltopdf/utils.py +++ b/wkhtmltopdf/utils.py @@ -7,11 +7,11 @@ import re import sys try: - from urllib import pathname2url - from urlparse import urljoin -except ImportError: # py3k from urllib.request import pathname2url from urllib.parse import urljoin +except ImportError: # Python2 + from urllib import pathname2url + from urlparse import urljoin from django.conf import settings from django.utils import six |