diff options
| author | Tim Graham <timograham@gmail.com> | 2015-02-09 13:19:34 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-02-09 14:24:06 -0500 |
| commit | a8b70d251d238b4e6cfc7bb4296da15494f8dff3 (patch) | |
| tree | 94ef5bc53e59131906aecfcf792eeac86242aa62 /django/utils/html.py | |
| parent | eb406aa686ff1809903366ef6896037af2f1f69b (diff) | |
[1.8.x] Sorted imports with isort; refs #23860.
Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master
Diffstat (limited to 'django/utils/html.py')
| -rw-r--r-- | django/utils/html.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/django/utils/html.py b/django/utils/html.py index a596662d22..1cb09357c2 100644 --- a/django/utils/html.py +++ b/django/utils/html.py @@ -6,17 +6,18 @@ import re import sys import warnings +from django.utils import six from django.utils.deprecation import RemovedInDjango20Warning -from django.utils.encoding import force_text, force_str +from django.utils.encoding import force_str, force_text from django.utils.functional import allow_lazy from django.utils.http import RFC3986_GENDELIMS, RFC3986_SUBDELIMS from django.utils.safestring import SafeData, SafeText, mark_safe -from django.utils import six -from django.utils.six.moves.urllib.parse import parse_qsl, quote, unquote, urlencode, urlsplit, urlunsplit +from django.utils.six.moves.urllib.parse import ( + parse_qsl, quote, unquote, urlencode, urlsplit, urlunsplit, +) from django.utils.text import normalize_newlines -from .html_parser import HTMLParser, HTMLParseError - +from .html_parser import HTMLParseError, HTMLParser # Configuration for urlize() function. TRAILING_PUNCTUATION = ['.', ',', ':', ';', '.)', '"', '\'', '!'] |
