openstack/horizon
Code Issues Proposed changes

Merge "[Django 1.9] Do not use TemplateDoesNotExist from Django"

Browse Source
This commit is contained in:
Jenkins
2016-01-22 16:30:22 +00:00
committed by Gerrit Code Review
parent 2635e65e52 e44c17a6e8
commit d4c7b8f813
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
horizon/loaders.py
View File

@@ -19,6 +19,9 @@ import os
import django import django
from django.conf import settings from django.conf import settings
if django.VERSION >= (1, 9):
from django.template.exceptions import TemplateDoesNotExist
else:
from django.template.base import TemplateDoesNotExist # noqa from django.template.base import TemplateDoesNotExist # noqa
if django.get_version() >= '1.8': if django.get_version() >= '1.8':