[1.6.x] Took advantage of django.utils.six.moves.urllib.*.

Backport of 6a6428a36 from master.

2 files changed, 2 insertions, 8 deletions

diff --git a/django/forms/fields.py b/django/forms/fields.py
index 76ee9b91d3..d9243f142a 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -9,10 +9,6 @@ import datetime
 import os
 import re
 import sys
-try:
-    from urllib.parse import urlsplit, urlunsplit
-except ImportError:     # Python 2
-    from urlparse import urlsplit, urlunsplit
 from decimal import Decimal, DecimalException
 from io import BytesIO
 
@@ -29,6 +25,7 @@ from django.utils import formats
 from django.utils.encoding import smart_text, force_str, force_text
 from django.utils.ipv6 import clean_ipv6_address
 from django.utils import six
+from django.utils.six.moves.urllib.parse import urlsplit, urlunsplit
 from django.utils.translation import ugettext_lazy as _, ungettext_lazy
 
 # Provide this import for backwards compatibility.
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',