From f9f792eb04dfd48d93682070583f473166b490ae Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Thu, 5 Sep 2013 14:38:59 -0500 Subject: [1.6.x] Took advantage of django.utils.six.moves.urllib.*. Backport of 6a6428a36 from master. --- django/forms/widgets.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'django/forms/widgets.py') diff --git a/django/forms/widgets.py b/django/forms/widgets.py index d74710bcba..cf68bac3f4 100644 --- a/django/forms/widgets.py +++ b/django/forms/widgets.py @@ -6,10 +6,6 @@ from __future__ import absolute_import, unicode_literals import copy from itertools import chain -try: - from urllib.parse import urljoin -except ImportError: # Python 2 - from urlparse import urljoin import warnings from django.conf import settings @@ -20,6 +16,7 @@ from django.utils.translation import ugettext_lazy from django.utils.encoding import force_text, python_2_unicode_compatible from django.utils.safestring import mark_safe from django.utils import datetime_safe, formats, six +from django.utils.six.moves.urllib.parse import urljoin __all__ = ( 'Media', 'MediaDefiningClass', 'Widget', 'TextInput', -- cgit v1.3