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

Backport of 6a6428a36 from master.

1 files changed, 1 insertions, 4 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.