summaryrefslogtreecommitdiff
path: root/django/utils/text.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-08-23 10:16:16 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-08-23 10:16:16 +0200
commit5301a9d7b1c2151e9b0496c7e244e8ceb6d273c1 (patch)
treea11180354176cacd63ded8373b7b14b4bb41034b /django/utils/text.py
parente06189f7ceb48013b37b902588bea6750c989b14 (diff)
[py3] Removed duplicate imports.
Fixed #18837. Refs #18791.
Diffstat (limited to 'django/utils/text.py')
-rw-r--r--django/utils/text.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/django/utils/text.py b/django/utils/text.py
index ca79a24f7c..e7c62131a0 100644
--- a/django/utils/text.py
+++ b/django/utils/text.py
@@ -1,11 +1,9 @@
from __future__ import unicode_literals
import re
-from django.utils import six
import unicodedata
import warnings
from gzip import GzipFile
-from django.utils.six.moves import html_entities
from io import BytesIO
from django.utils.encoding import force_text
@@ -15,6 +13,7 @@ if not six.PY3:
from django.utils.encoding import force_unicode
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.safestring import mark_safe