From c66222e8d649ef3d10ca679921c4c6ce8793cddd Mon Sep 17 00:00:00 2001 From: Matt Lenc Date: Wed, 18 Jun 2014 17:11:38 +0100 Subject: First try py3k then fall back to python2 --- wkhtmltopdf/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'wkhtmltopdf/utils.py') 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 -- cgit v1.2.3