summaryrefslogtreecommitdiff
path: root/django/templatetags
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/templatetags
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/templatetags')
-rw-r--r--django/templatetags/i18n.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/django/templatetags/i18n.py b/django/templatetags/i18n.py
index 0bfb4a9eff..ecaf84a035 100644
--- a/django/templatetags/i18n.py
+++ b/django/templatetags/i18n.py
@@ -3,9 +3,8 @@ import re
import sys
from django.conf import settings
-from django.template import (Node, Variable, TemplateSyntaxError,
- TokenParser, Library, TOKEN_TEXT, TOKEN_VAR)
-from django.template.base import render_value_in_context
+from django.template import Library, Node, TemplateSyntaxError, Variable
+from django.template.base import render_value_in_context, TokenParser, TOKEN_TEXT, TOKEN_VAR
from django.template.defaulttags import token_kwargs
from django.utils import six
from django.utils import translation