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/utils/html.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'django/utils/html.py') diff --git a/django/utils/html.py b/django/utils/html.py index 89e790d96f..b55a2234b5 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 -- cgit v1.3