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/fields.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'django/forms/fields.py') 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. -- cgit v1.3