diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-09-05 14:38:59 -0500 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2013-09-10 21:29:31 +0200 |
| commit | f9f792eb04dfd48d93682070583f473166b490ae (patch) | |
| tree | c66c3d474e808d664b3b24b94fdc3d5344295c4f /django/forms/widgets.py | |
| parent | 960f5bc75901f76e9b4b356f98b22b494fb47611 (diff) | |
[1.6.x] Took advantage of django.utils.six.moves.urllib.*.
Backport of 6a6428a36 from master.
Diffstat (limited to 'django/forms/widgets.py')
| -rw-r--r-- | django/forms/widgets.py | 5 |
1 files changed, 1 insertions, 4 deletions
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', |
