From ba2feabd538da3d990e8e8b53dcdddb489b029d4 Mon Sep 17 00:00:00 2001 From: James Fenwick Date: Fri, 11 Dec 2015 12:59:26 +0000 Subject: [PATCH] Update templatetags for 1.9 --- src/fobi/templatetags/fobi_tags.py | 5 ++++- src/fobi/templatetags/future_compat.py | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/fobi/templatetags/fobi_tags.py b/src/fobi/templatetags/fobi_tags.py index 1124984b..89ce2e21 100644 --- a/src/fobi/templatetags/fobi_tags.py +++ b/src/fobi/templatetags/fobi_tags.py @@ -12,7 +12,10 @@ from django.template import Library, TemplateSyntaxError, Node from django.conf import settings from django import forms from django.utils.translation import ugettext_lazy as _ -from django.forms.util import ErrorDict +try: + from django.forms.util import ErrorDict +except ImportError: + from django.forms.utils import ErrorList as ErrorDict from fobi.settings import DISPLAY_AUTH_LINK diff --git a/src/fobi/templatetags/future_compat.py b/src/fobi/templatetags/future_compat.py index 9b6d7429..3df07866 100644 --- a/src/fobi/templatetags/future_compat.py +++ b/src/fobi/templatetags/future_compat.py @@ -13,8 +13,12 @@ except ImportError: import warnings from django.template.base import ( - Node, TemplateSyntaxError, Library + Node, TemplateSyntaxError ) + try: + from django.template.base import Library + except ImportError: + from django.template import Library from django.utils.timezone import template_localtime from django.utils.formats import localize from django.utils.encoding import force_text