mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

Removed extraneous arguments in Engine.from_string. 

This aligns the Django Template Engine API with the common template
backend API.
This commit is contained in:
Aymeric Augustin 2014-11-28 22:29:45 +01:00
parent f50a09f2cd
commit f9a6ebf6f5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/template/engine.py
View File

@ -140,12 +140,12 @@ class Engine(object):
pass pass
raise TemplateDoesNotExist(name) raise TemplateDoesNotExist(name)
def from_string(self, source, origin=None, name=None): def from_string(self, template_code):
""" """
Returns a compiled Template object for the given template code, Returns a compiled Template object for the given template code,
handling template inheritance recursively. handling template inheritance recursively.
""" """
return Template(source, origin, name, engine=self) return Template(template_code, engine=self)
def get_template(self, template_name, dirs=_dirs_undefined): def get_template(self, template_name, dirs=_dirs_undefined):
""" """
@ -162,7 +162,7 @@ class Engine(object):
template, origin = self.find_template(template_name, dirs) template, origin = self.find_template(template_name, dirs)
if not hasattr(template, 'render'): if not hasattr(template, 'render'):
# template needs to be compiled # template needs to be compiled
template = self.from_string(template, origin, template_name) template = Template(template, origin, template_name, engine=self)
return template return template
def render_to_string(self, template_name, dictionary=None, context_instance=None, def render_to_string(self, template_name, dictionary=None, context_instance=None,

4
django/template/loaders/base.py
View File

@ -1,4 +1,4 @@
from django.template.base import TemplateDoesNotExist from django.template.base import Template, TemplateDoesNotExist
class Loader(object): class Loader(object):
@ -20,7 +20,7 @@ class Loader(object):
template_name, template_dirs) template_name, template_dirs)
try: try:
template = self.engine.from_string(source, origin, template_name) template = Template(source, origin, template_name, self.engine)
except TemplateDoesNotExist: except TemplateDoesNotExist:
# If compiling the template we found raises TemplateDoesNotExist, # If compiling the template we found raises TemplateDoesNotExist,
# back off to returning the source and display name for the # back off to returning the source and display name for the

4
django/template/loaders/cached.py
View File

@ -4,7 +4,7 @@ to load templates from them in order, caching the result.
""" """
import hashlib import hashlib
from django.template.base import TemplateDoesNotExist from django.template.base import Template, TemplateDoesNotExist
from django.utils.encoding import force_bytes from django.utils.encoding import force_bytes
from .base import Loader as BaseLoader from .base import Loader as BaseLoader
@ -61,7 +61,7 @@ class Loader(BaseLoader):
template, origin = self.find_template(template_name, template_dirs) template, origin = self.find_template(template_name, template_dirs)
if not hasattr(template, 'render'): if not hasattr(template, 'render'):
try: try:
template = self.engine.from_string(template, origin, template_name) template = Template(template, origin, template_name, self.engine)
except TemplateDoesNotExist: except TemplateDoesNotExist:
# If compiling the template we found raises TemplateDoesNotExist, # If compiling the template we found raises TemplateDoesNotExist,
# back off to returning the source and display name for the template # back off to returning the source and display name for the template