mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 01:25:32 +00:00
Code Issues 32 Releases Wiki Activity

Added comments to remove Engine.render_to_string in Django 2.0.

Browse Source 
Since this is a private API introduced in Django 1.8, no documentation
is required.
This commit is contained in:
Aymeric Augustin
2014-12-29 23:51:25 +01:00
parent 2e65d56156
commit ed220c4cbe
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
django/template/engine.py
View File

@@ -171,16 +171,16 @@ class Engine(object):
template = Template(template, origin, template_name, engine=self) template = Template(template, origin, template_name, engine=self)
return template return template
# This method was originally a function defined in django.template.loader.
# It was moved here in Django 1.8 when encapsulating the Django template
# engine in this Engine class. It's still called by deprecated code but it
# will be removed in Django 2.0. It's superseded by a new render_to_string
# function in django.template.loader.
def render_to_string(self, template_name, context=None, def render_to_string(self, template_name, context=None,
context_instance=_context_instance_undefined, context_instance=_context_instance_undefined,
dirs=_dirs_undefined, dirs=_dirs_undefined,
dictionary=_dictionary_undefined): dictionary=_dictionary_undefined):
"""
Loads the given template_name and renders it with the given dictionary as
context. The template_name may be a string to load a single template using
get_template, or it may be a tuple to use select_template to find one of
the templates in the list. Returns a string.
"""
if context_instance is _context_instance_undefined: if context_instance is _context_instance_undefined:
context_instance = None context_instance = None
else: else:

6
django/template/loader.py
View File

@@ -100,9 +100,9 @@ def render_to_string(template_name, context=None,
# Some deprecated arguments were passed - use the legacy code path # Some deprecated arguments were passed - use the legacy code path
for engine in _engine_list(using): for engine in _engine_list(using):
try: try:
# This is required for deprecating arguments specific to Django # This is required for deprecating properly arguments specific
# templates. Simply return engine.render_to_string(template_name, # to Django templates. Remove Engine.render_to_string() at the
# context) in Django 2.0. # same time as this code path in Django 2.0.
if isinstance(engine, DjangoTemplates): if isinstance(engine, DjangoTemplates):
# Hack -- use the internal Engine instance of DjangoTemplates. # Hack -- use the internal Engine instance of DjangoTemplates.
return engine.engine.render_to_string( return engine.engine.render_to_string(