Commit 0be14b0b authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixed #12248 -- Refactored django.template to get code out of __init__.py, to... 

Fixed #12248 -- Refactored django.template to get code out of __init__.py, to help with avoiding circular import dependencies. Thanks to Tom Tobin for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 5fc9cbc1

django/template/__init__.py

+27 −1003

File changed.

Preview size limit exceeded, changes collapsed.

django/template/base.py

0 → 100644
+1005 −0

File added.

Preview size limit exceeded, changes collapsed.

django/template/debug.py

+1 −1
Original line number Diff line number Diff line 
from django.conf import settings

from django.template import Lexer, Parser, tag_re, NodeList, VariableNode, TemplateSyntaxError

from django.template.base import Lexer, Parser, tag_re, NodeList, VariableNode, TemplateSyntaxError

from django.utils.encoding import force_unicode

from django.utils.html import escape

from django.utils.safestring import SafeData, EscapeData

django/template/defaultfilters.py

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ try: 
except ImportError:

    from django.utils.functional import wraps  # Python 2.4 fallback.



from django.template import Variable, Library

from django.template.base import Variable, Library

from django.conf import settings

from django.utils import formats

from django.utils.encoding import force_unicode, iri_to_uri

django/template/defaulttags.py

+3 −3
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ import sys 
import re

from itertools import groupby, cycle as itertools_cycle



from django.template import Node, NodeList, Template, Context, Variable

from django.template import TemplateSyntaxError, VariableDoesNotExist, BLOCK_TAG_START, BLOCK_TAG_END, VARIABLE_TAG_START, VARIABLE_TAG_END, SINGLE_BRACE_START, SINGLE_BRACE_END, COMMENT_TAG_START, COMMENT_TAG_END

from django.template import get_library, Library, InvalidTemplateLibrary

from django.template.base import Node, NodeList, Template, Context, Variable

from django.template.base import TemplateSyntaxError, VariableDoesNotExist, BLOCK_TAG_START, BLOCK_TAG_END, VARIABLE_TAG_START, VARIABLE_TAG_END, SINGLE_BRACE_START, SINGLE_BRACE_END, COMMENT_TAG_START, COMMENT_TAG_END

from django.template.base import get_library, Library, InvalidTemplateLibrary

from django.template.smartif import IfParser, Literal

from django.conf import settings

from django.utils.encoding import smart_str, smart_unicode