From 35217029ebe6c452fefa55e72f75351dd78b77f7 Mon Sep 17 00:00:00 2001 From: zmsmith Date: Wed, 5 Mar 2014 15:57:50 -0500 Subject: [PATCH] Raise django TemplateDoesNotExist instead of jinja TemplateNotFound --- coffin/template/loader.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/coffin/template/loader.py b/coffin/template/loader.py index 9fa8049..1555107 100644 --- a/coffin/template/loader.py +++ b/coffin/template/loader.py @@ -4,7 +4,7 @@ The module provides a generic way to load templates from an arbitrary backend storage (e.g. filesystem, database). """ -from coffin.template import Template as CoffinTemplate +from django.template import TemplateDoesNotExist from jinja2 import TemplateNotFound @@ -21,7 +21,10 @@ def get_template(template_name): # Jinja will handle this for us, and env also initializes # the loader backends the first time it is called. from coffin.common import env - return env.get_template(template_name) + try: + return env.get_template(template_name) + except TemplateNotFound: + raise TemplateDoesNotExist(template_name) def get_template_from_string(source): @@ -60,7 +63,7 @@ def select_template(template_name_list): for template_name in template_name_list: try: return get_template(template_name) - except TemplateNotFound: + except TemplateDoesNotExist: continue # If we get here, none of the templates could be loaded - raise TemplateNotFound(', '.join(template_name_list)) + raise TemplateDoesNotExist(', '.join(template_name_list))