Fixed #6262 -- Added a cached template loader, and modified existing template... (44b9076b) · Commits · Dom Sekotill / django

AUTHORS

+1 −0

Original line number	Diff line number	Diff line
		@@ -288,6 +288,7 @@ answer newbie questions, and generally made Django that much better:
		Martin Mahner <http://www.mahner.org/>
		Matt McClanahan <http://mmcc.cx/>
		Frantisek Malina <vizualbod@vizualbod.com>
		Mike Malone <mjmalone@gmail.com>
		Martin Maney <http://www.chipy.org/Martin_Maney>
		masonsimon+django@gmail.com
		Manuzhai

django/conf/global_settings.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -158,9 +158,9 @@ TEMPLATE_DIRS = ()
		# See the comments in django/core/template/loader.py for interface
		# documentation.
		TEMPLATE_LOADERS = (
		'django.template.loaders.filesystem.load_template_source',
		'django.template.loaders.app_directories.load_template_source',
		# 'django.template.loaders.eggs.load_template_source',
		'django.template.loaders.filesystem.Loader',
		'django.template.loaders.app_directories.Loader',
		# 'django.template.loaders.eggs.Loader',
		)

		# List of processors used by RequestContext to populate the context.

django/conf/project_template/settings.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -52,9 +52,9 @@ SECRET_KEY = ''

		# List of callables that know how to import templates from various sources.
		TEMPLATE_LOADERS = (
		'django.template.loaders.filesystem.load_template_source',
		'django.template.loaders.app_directories.load_template_source',
		# 'django.template.loaders.eggs.load_template_source',
		'django.template.loaders.filesystem.Loader',
		'django.template.loaders.app_directories.Loader',
		# 'django.template.loaders.eggs.Loader',
		)

		MIDDLEWARE_CLASSES = (

django/template/init.py

+8 −1

Original line number	Diff line number	Diff line
		@@ -173,9 +173,16 @@ class Template(object):
		for subnode in node:
		yield subnode

		def _render(self, context):
		return self.nodelist.render(context)

		def render(self, context):
		"Display stage -- can be called many times"
		return self.nodelist.render(context)
		context.render_context.push()
		try:
		return self._render(context)
		finally:
		context.render_context.pop()

		def compile_string(template_string, origin):
		"Compiles template_string into NodeList ready for rendering"

django/template/context.py

+48 −14

Original line number	Diff line number	Diff line
		@@ -12,45 +12,42 @@ class ContextPopException(Exception):
		"pop() has been called more times than push()"
		pass

		class Context(object):
		"A stack container for variable context"
		def __init__(self, dict_=None, autoescape=True, current_app=None):
		class BaseContext(object):
		def __init__(self, dict_=None):
		dict_ = dict_ or {}
		self.dicts = [dict_]
		self.autoescape = autoescape
		self.current_app = current_app

		def __repr__(self):
		return repr(self.dicts)

		def __iter__(self):
		for d in self.dicts:
		for d in reversed(self.dicts):
		yield d

		def push(self):
		d = {}
		self.dicts = [d] + self.dicts
		self.dicts.append(d)
		return d

		def pop(self):
		if len(self.dicts) == 1:
		raise ContextPopException
		return self.dicts.pop(0)
		return self.dicts.pop()

		def __setitem__(self, key, value):
		"Set a variable in the current context"
		self.dicts[0][key] = value
		self.dicts[-1][key] = value

		def __getitem__(self, key):
		"Get a variable's value, starting at the current context and going upward"
		for d in self.dicts:
		for d in reversed(self.dicts):
		if key in d:
		return d[key]
		raise KeyError(key)

		def __delitem__(self, key):
		"Delete a variable from the current context"
		del self.dicts[0][key]
		del self.dicts[-1][key]

		def has_key(self, key):
		for d in self.dicts:
		@@ -58,21 +55,58 @@ class Context(object):
		return True
		return False

		__contains__ = has_key
		def __contains__(self, key):
		return self.has_key(key)

		def get(self, key, otherwise=None):
		for d in self.dicts:
		for d in reversed(self.dicts):
		if key in d:
		return d[key]
		return otherwise

		class Context(BaseContext):
		"A stack container for variable context"
		def __init__(self, dict_=None, autoescape=True, current_app=None):
		self.autoescape = autoescape
		self.current_app = current_app
		self.render_context = RenderContext()
		super(Context, self).__init__(dict_)

		def update(self, other_dict):
		"Like dict.update(). Pushes an entire dictionary's keys and values onto the context."
		if not hasattr(other_dict, '__getitem__'):
		raise TypeError('other_dict must be a mapping (dictionary-like) object.')
		self.dicts = [other_dict] + self.dicts
		self.dicts.append(other_dict)
		return other_dict

		class RenderContext(BaseContext):
		"""
		A stack container for storing Template state.

		RenderContext simplifies the implementation of template Nodes by providing a
		safe place to store state between invocations of a node's `render` method.

		The RenderContext also provides scoping rules that are more sensible for
		'template local' variables. The render context stack is pushed before each
		template is rendered, creating a fresh scope with nothing in it. Name
		resolution fails if a variable is not found at the top of the RequestContext
		stack. Thus, variables are local to a specific template and don't affect the
		rendering of other templates as they would if they were stored in the normal
		template context.
		"""
		def __iter__(self):
		for d in self.dicts[-1]:
		yield d

		def has_key(self, key):
		return key in self.dicts[-1]

		def get(self, key, otherwise=None):
		d = self.dicts[-1]
		if key in d:
		return d[key]
		return otherwise

		# This is a function rather than module-level procedural code because we only
		# want it to execute if somebody uses RequestContext.
		def get_standard_processors():