diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-09-05 14:38:59 -0500 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-09-05 14:39:23 -0500 |
| commit | 6a6428a36f221446b17eaf4876e92d3db1781962 (patch) | |
| tree | a57290e315203b770a56b0d4691ee2d4d104cccc /django/utils/html.py | |
| parent | ed9cd4fd8b425ab5010b27aefc7ef6e50d55fb54 (diff) | |
Took advantage of django.utils.six.moves.urllib.*.
Diffstat (limited to 'django/utils/html.py')
| -rw-r--r-- | django/utils/html.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/django/utils/html.py b/django/utils/html.py index 46750d9cad..76fc23713d 100644 --- a/django/utils/html.py +++ b/django/utils/html.py @@ -3,16 +3,12 @@ from __future__ import unicode_literals import re -try: - from urllib.parse import quote, unquote, urlsplit, urlunsplit -except ImportError: # Python 2 - from urllib import quote, unquote - from urlparse import urlsplit, urlunsplit from django.utils.safestring import SafeData, mark_safe from django.utils.encoding import force_text, force_str from django.utils.functional import allow_lazy from django.utils import six +from django.utils.six.moves.urllib.parse import quote, unquote, urlsplit, urlunsplit from django.utils.text import normalize_newlines from .html_parser import HTMLParser, HTMLParseError |
