From e44c17a6e8dd16ff5caf2048ce3381b6ac1a41bd Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 15 Jan 2016 11:00:01 +0000 Subject: [PATCH] [Django 1.9] Do not use TemplateDoesNotExist from Django TemplateDoesNotExist was removed from Django 1.9. This is a trivial class which exists only to raise exception, and which can easily be redefined in our code. Change-Id: I593864d7e6e97f9244fd2b0717351136b6547323 Closes-Bug: #1534553 Co-Authored-By: Rob Cresswell Partially-Implements: blueprint drop-dj17 --- horizon/loaders.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/horizon/loaders.py b/horizon/loaders.py index 9a7a133c34..850fa99a43 100644 --- a/horizon/loaders.py +++ b/horizon/loaders.py @@ -19,7 +19,10 @@ import os import django from django.conf import settings -from django.template.base import TemplateDoesNotExist # noqa +if django.VERSION >= (1, 9): + from django.template.exceptions import TemplateDoesNotExist +else: + from django.template.base import TemplateDoesNotExist # noqa if django.get_version() >= '1.8': from django.template.engine import Engine