Commit b15eaa29 authored by Chris Lamb's avatar Chris Lamb Committed by Tim Graham
Browse files

[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
parent 95eca4f5

django/template/engine.py

+4 −4
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ class Engine(object): 
        else:

            warnings.warn(

                "The context_instance argument of render_to_string is "

                "deprecated.", RemovedInDjango110Warning, stacklevel=2)

                "deprecated.", RemovedInDjango110Warning, stacklevel=3)

        if dirs is _dirs_undefined:

            # Do not set dirs to None here to avoid triggering the deprecation

            # warning in select_template or get_template.
@@ -193,13 +193,13 @@ class Engine(object): 
        else:

            warnings.warn(

                "The dirs argument of render_to_string is deprecated.",

                RemovedInDjango110Warning, stacklevel=2)

                RemovedInDjango110Warning, stacklevel=3)

        if dictionary is _dictionary_undefined:

            dictionary = None

        else:

            warnings.warn(

                "The dictionary argument of render_to_string was renamed to "

                "context.", RemovedInDjango110Warning, stacklevel=2)

                "context.", RemovedInDjango110Warning, stacklevel=3)

            context = dictionary



        if isinstance(template_name, (list, tuple)):
@@ -231,7 +231,7 @@ class Engine(object): 
        else:

            warnings.warn(

                "The dirs argument of select_template is deprecated.",

                RemovedInDjango110Warning, stacklevel=2)

                RemovedInDjango110Warning, stacklevel=3)



        if not template_name_list:

            raise TemplateDoesNotExist("No template names provided")