diff --git a/django/template/engine.py b/django/template/engine.py index aa239f2148..027d034877 100644 --- a/django/template/engine.py +++ b/django/template/engine.py @@ -121,6 +121,13 @@ class Engine(object): pass raise TemplateDoesNotExist(name) + def from_string(self, source, origin=None, name=None): + """ + Returns a compiled Template object for the given template code, + handling template inheritance recursively. + """ + return Template(source, origin, name) + def get_template(self, template_name, dirs=_dirs_undefined): """ Returns a compiled Template object for the given template name, @@ -136,16 +143,9 @@ class Engine(object): template, origin = self.find_template(template_name, dirs) if not hasattr(template, 'render'): # template needs to be compiled - template = self.get_template_from_string(template, origin, template_name) + template = self.from_string(template, origin, template_name) return template - def get_template_from_string(self, source, origin=None, name=None): - """ - Returns a compiled Template object for the given template code, - handling template inheritance recursively. - """ - return Template(source, origin, name) - def render_to_string(self, template_name, dictionary=None, context_instance=None, dirs=_dirs_undefined): """ diff --git a/django/template/loader.py b/django/template/loader.py index 7d3d9f5097..d7c42627d1 100644 --- a/django/template/loader.py +++ b/django/template/loader.py @@ -24,7 +24,7 @@ def get_template(*args, **kwargs): def get_template_from_string(*args, **kwargs): - return Engine.get_default().get_template_from_string(*args, **kwargs) + return Engine.get_default().from_string(*args, **kwargs) def render_to_string(*args, **kwargs):