summaryrefslogtreecommitdiff
path: root/django/utils/translation/template.py
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2017-01-07 12:11:46 +0100
committerClaude Paroz <claude@2xlibre.net>2017-01-18 21:33:28 +0100
commit2b281cc35ed9d997614ca3c416928d7fabfef1ad (patch)
treed3e73cf44b15139aa9f1f53e398942ba64f5e190 /django/utils/translation/template.py
parent7b2f2e74adb36a4334e83130f6abc2f79d395235 (diff)
Refs #23919 -- Removed most of remaining six usage
Thanks Tim Graham for the review.
Diffstat (limited to 'django/utils/translation/template.py')
-rw-r--r--django/utils/translation/template.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/translation/template.py b/django/utils/translation/template.py
index b6d8832f9c..42ff84dc27 100644
--- a/django/utils/translation/template.py
+++ b/django/utils/translation/template.py
@@ -1,12 +1,12 @@
import re
import warnings
+from io import StringIO
from django.template.base import (
TOKEN_BLOCK, TOKEN_COMMENT, TOKEN_TEXT, TOKEN_VAR, TRANSLATOR_COMMENT_MARK,
Lexer,
)
from django.utils.encoding import force_text
-from django.utils.six import StringIO
from . import TranslatorCommentWarning, trim_whitespace