Permalink
Browse files

Removed support code for deprecated module-based template loaders fro…

…m debug view postmortem.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16003 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 74f7ad3 commit ecdcf477f9fefd976dd19d1a84a6d36204b4e404 @ramiro ramiro committed Apr 2, 2011
Showing with 3 additions and 10 deletions.
  1. +3 −10 django/views/debug.py
View
13 django/views/debug.py
@@ -88,21 +88,14 @@ def get_traceback_html(self):
self.loader_debug_info = []
for loader in template_source_loaders:
try:
- module = import_module(loader.__module__)
- if hasattr(loader, '__class__'):
- source_list_func = loader.get_template_sources
- else: # NOTE: Remember to remove this branch when we deprecate old template loaders in 1.4
- source_list_func = module.get_template_sources
+ source_list_func = loader.get_template_sources
# 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):
+ except 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__
+ loader_name = loader.__module__ + '.' + loader.__class__.__name__
self.loader_debug_info.append({
'loader': loader_name,
'templates': template_list,

0 comments on commit ecdcf47

Please sign in to comment.