summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2014-11-10 21:40:26 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2014-12-28 14:47:31 +0100
commit7eefdbf7ab9f5bafe5baae2b877d93efc90e3044 (patch)
tree4b9430487a775ad62415d983d56531cee7f5d0d1 /django/utils
parentbfa21ddf7649799a2254b50cb83eb5276cb7f129 (diff)
Cleaned up the django.template namespace.
Since this package is going to hold both the implementation of the Django Template Language and the infrastructure for Multiple Template Engines, it should be untied from the DTL as much as possible within our backwards-compatibility policy. Only public APIs (i.e. APIs mentioned in the documentation) were left.
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/translation/trans_real.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py
index 2af2f1dd35..1d4d100206 100644
--- a/django/utils/translation/trans_real.py
+++ b/django/utils/translation/trans_real.py
@@ -544,8 +544,8 @@ def templatize(src, origin=None):
does so by translating the Django translation tags into standard gettext
function invocations.
"""
- from django.template import (Lexer, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK,
- TOKEN_COMMENT, TRANSLATOR_COMMENT_MARK)
+ from django.template.base import (Lexer, TOKEN_TEXT, TOKEN_VAR,
+ TOKEN_BLOCK, TOKEN_COMMENT, TRANSLATOR_COMMENT_MARK)
src = force_text(src, settings.FILE_CHARSET)
out = StringIO('')
message_context = None