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/text.py | |
| parent | eb406aa686ff1809903366ef6896037af2f1f69b (diff) | |
[1.8.x] Sorted imports with isort; refs #23860.
Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master
Diffstat (limited to 'django/utils/text.py')
| -rw-r--r-- | django/utils/text.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/django/utils/text.py b/django/utils/text.py index 8446b0a238..eb66b77578 100644 --- a/django/utils/text.py +++ b/django/utils/text.py @@ -2,17 +2,17 @@ from __future__ import unicode_literals import re import unicodedata +import warnings from gzip import GzipFile from io import BytesIO -import warnings +from django.utils import six from django.utils.deprecation import RemovedInDjango19Warning from django.utils.encoding import force_text -from django.utils.functional import allow_lazy, SimpleLazyObject -from django.utils import six -from django.utils.six.moves import html_entities -from django.utils.translation import ugettext_lazy, ugettext as _, pgettext +from django.utils.functional import SimpleLazyObject, allow_lazy from django.utils.safestring import SafeText, mark_safe +from django.utils.six.moves import html_entities +from django.utils.translation import pgettext, ugettext as _, ugettext_lazy if six.PY2: # Import force_unicode even though this module doesn't use it, because some |
