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/core/validators.py | |
| parent | 960f5bc75901f76e9b4b356f98b22b494fb47611 (diff) | |
[1.6.x] Took advantage of django.utils.six.moves.urllib.*.
Backport of 6a6428a36 from master.
Diffstat (limited to 'django/core/validators.py')
| -rw-r--r-- | django/core/validators.py | 6 |
1 files changed, 2 insertions, 4 deletions
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, '', [], (), {}) |
