Commit a289eba5 authored by Ramiro Morales's avatar Ramiro Morales
Browse files

[1.2.X] Fixed #15158 -- Fixed error introduced in r15252 in rendering of the... 

[1.2.X] Fixed #15158 -- Fixed error introduced in r15252 in rendering of the template post morten section of the 500 error debug page with loaders other than the file system or application dir loaders. Refs #15122. Thanks gsf for the report.

Backport of [15360] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15361 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 86b0d5c1

django/views/debug.py

+4 −2
Original line number Diff line number Diff line
@@ -90,16 +90,18 @@ class ExceptionReporter: 
                    module = import_module(loader.__module__)

                    if hasattr(loader, '__class__'):

                        source_list_func = loader.get_template_sources

                        loader_name = loader.__module__ + '.' + loader.__class__.__name__

                    else: # NOTE: Remember to remove this branch when we deprecate old template loaders in 1.4

                        source_list_func = module.get_template_sources

                        loader_name = loader.__module__ + '.' + loader.__name__

                    # NOTE: This assumes exc_value is the name of the template that

                    # the loader attempted to load.

                    template_list = [{'name': t, 'exists': os.path.exists(t)} \

                        for t in source_list_func(str(self.exc_value))]

                except (ImportError, AttributeError):

                    template_list = []

                if hasattr(loader, '__class__'):

                    loader_name = loader.__module__ + '.' + loader.__class__.__name__

                else: # NOTE: Remember to remove this branch when we deprecate old template loaders in 1.4

                    loader_name = loader.__module__ + '.' + loader.__name__

                self.loader_debug_info.append({

                    'loader': loader_name,

                    'templates': template_list,