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/core/validators.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'django/core/validators.py') diff --git a/django/core/validators.py b/django/core/validators.py index aa417ed099..78716ccd40 100644 --- a/django/core/validators.py +++ b/django/core/validators.py @@ -1,16 +1,14 @@ from __future__ import unicode_literals import re -try: - from urllib.parse import urlsplit, urlunsplit -except ImportError: # Python 2 - from urlparse import urlsplit, urlunsplit from django.core.exceptions import ValidationError from django.utils.translation import ugettext_lazy as _, ungettext_lazy from django.utils.encoding import force_text from django.utils.ipv6 import is_valid_ipv6_address from django.utils import six +from django.utils.six.moves.urllib.parse import urlsplit, urlunsplit + # These values, if given to validate(), will trigger the self.required check. EMPTY_VALUES = (None, '', [], (), {}) -- cgit v1.3