summaryrefslogtreecommitdiff
path: root/django/forms/widgets.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-09-05 14:38:59 -0500
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-09-05 14:39:23 -0500
commit6a6428a36f221446b17eaf4876e92d3db1781962 (patch)
treea57290e315203b770a56b0d4691ee2d4d104cccc /django/forms/widgets.py
parented9cd4fd8b425ab5010b27aefc7ef6e50d55fb54 (diff)
Took advantage of django.utils.six.moves.urllib.*.
Diffstat (limited to 'django/forms/widgets.py')
-rw-r--r--django/forms/widgets.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index aa216e617b..26f8d312e4 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -6,10 +6,6 @@ from __future__ 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',