Kaydet (Commit) b15eaa29 authored tarafından Chris Lamb's avatar Chris Lamb Kaydeden (comit) Tim Graham

[1.8.x] Corrected stacklevel in Engine deprecation warnings.

Otherwise we just see django.template.loader and not the "original"
callers.

Backport of ed950915 from stable/1.9.x
üst 95eca4f5
...@@ -185,7 +185,7 @@ class Engine(object): ...@@ -185,7 +185,7 @@ class Engine(object):
else: else:
warnings.warn( warnings.warn(
"The context_instance argument of render_to_string is " "The context_instance argument of render_to_string is "
"deprecated.", RemovedInDjango110Warning, stacklevel=2) "deprecated.", RemovedInDjango110Warning, stacklevel=3)
if dirs is _dirs_undefined: if dirs is _dirs_undefined:
# Do not set dirs to None here to avoid triggering the deprecation # Do not set dirs to None here to avoid triggering the deprecation
# warning in select_template or get_template. # warning in select_template or get_template.
...@@ -193,13 +193,13 @@ class Engine(object): ...@@ -193,13 +193,13 @@ class Engine(object):
else: else:
warnings.warn( warnings.warn(
"The dirs argument of render_to_string is deprecated.", "The dirs argument of render_to_string is deprecated.",
RemovedInDjango110Warning, stacklevel=2) RemovedInDjango110Warning, stacklevel=3)
if dictionary is _dictionary_undefined: if dictionary is _dictionary_undefined:
dictionary = None dictionary = None
else: else:
warnings.warn( warnings.warn(
"The dictionary argument of render_to_string was renamed to " "The dictionary argument of render_to_string was renamed to "
"context.", RemovedInDjango110Warning, stacklevel=2) "context.", RemovedInDjango110Warning, stacklevel=3)
context = dictionary context = dictionary
if isinstance(template_name, (list, tuple)): if isinstance(template_name, (list, tuple)):
...@@ -231,7 +231,7 @@ class Engine(object): ...@@ -231,7 +231,7 @@ class Engine(object):
else: else:
warnings.warn( warnings.warn(
"The dirs argument of select_template is deprecated.", "The dirs argument of select_template is deprecated.",
RemovedInDjango110Warning, stacklevel=2) RemovedInDjango110Warning, stacklevel=3)
if not template_name_list: if not template_name_list:
raise TemplateDoesNotExist("No template names provided") raise TemplateDoesNotExist("No template names provided")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment