diff options
| author | Aymeric Augustin | 2013-10-16 22:14:41 +0200 | 
|---|---|---|
| committer | Aymeric Augustin | 2013-10-17 18:24:57 +0200 | 
| commit | c1f39b1a168d535e0b90d3c69273e391adf22637 (patch) | |
| tree | 9ae12cb257585e4681edea253209d9c150f3731a /debug_toolbar/views.py | |
| parent | 79831e4053b472921621f288483e95a961a4d142 (diff) | |
| download | django-debug-toolbar-c1f39b1a168d535e0b90d3c69273e391adf22637.tar.bz2 | |
Remove compatibility code for unsupported version of Django.
Diffstat (limited to 'debug_toolbar/views.py')
| -rw-r--r-- | debug_toolbar/views.py | 30 | 
1 files changed, 13 insertions, 17 deletions
diff --git a/debug_toolbar/views.py b/debug_toolbar/views.py index 1445360..ab91cde 100644 --- a/debug_toolbar/views.py +++ b/debug_toolbar/views.py @@ -120,23 +120,19 @@ def template_source(request):      if template_name is None:          return HttpResponseBadRequest('"template" key is required') -    try:  # Django 1.2 ... -        from django.template.loader import find_template_loader, make_origin -        loaders = [] -        for loader_name in settings.TEMPLATE_LOADERS: -            loader = find_template_loader(loader_name) -            if loader is not None: -                loaders.append(loader) -        for loader in loaders: -            try: -                source, display_name = loader.load_template_source(template_name) -                origin = make_origin(display_name, loader, template_name, settings.TEMPLATE_DIRS) -                break -            except TemplateDoesNotExist: -                source = "Template Does Not Exist: %s" % (template_name,) -    except (ImportError, AttributeError):  # Django 1.1 ... -        from django.template.loader import find_template_source -        source, origin = find_template_source(template_name) +    from django.template.loader import find_template_loader, make_origin +    loaders = [] +    for loader_name in settings.TEMPLATE_LOADERS: +        loader = find_template_loader(loader_name) +        if loader is not None: +            loaders.append(loader) +    for loader in loaders: +        try: +            source, display_name = loader.load_template_source(template_name) +            origin = make_origin(display_name, loader, template_name, settings.TEMPLATE_DIRS) +            break +        except TemplateDoesNotExist: +            source = "Template Does Not Exist: %s" % (template_name,)      try:          from pygments import highlight  | 
