From 28c5a3a742bd2c7a4017e10e487e6fa4fdb8c15f Mon Sep 17 00:00:00 2001 From: medmunds Date: Sun, 20 Apr 2014 14:43:59 -0700 Subject: [PATCH] Fix PendingDeprecationWarning for cycle tag on Django 1.6+ --- djrill/templates/djrill/senders_list.html | 2 ++ djrill/templates/djrill/tags_list.html | 2 ++ djrill/templates/djrill/urls_list.html | 2 ++ djrill/templatetags/__init__.py | 0 djrill/templatetags/djrill_future.py | 16 ++++++++++++++++ 5 files changed, 22 insertions(+) create mode 100644 djrill/templatetags/__init__.py create mode 100644 djrill/templatetags/djrill_future.py diff --git a/djrill/templates/djrill/senders_list.html b/djrill/templates/djrill/senders_list.html index c8f1976..df86a9d 100644 --- a/djrill/templates/djrill/senders_list.html +++ b/djrill/templates/djrill/senders_list.html @@ -1,6 +1,8 @@ {% extends "admin/base_site.html" %} {% load admin_list i18n %} {% load url from future %} +{% load cycle from djrill_future %} + {% block extrastyle %} {{ block.super }} diff --git a/djrill/templates/djrill/tags_list.html b/djrill/templates/djrill/tags_list.html index 65f0d76..f6fb80f 100644 --- a/djrill/templates/djrill/tags_list.html +++ b/djrill/templates/djrill/tags_list.html @@ -1,6 +1,8 @@ {% extends "admin/base_site.html" %} {% load admin_list i18n %} {% load url from future %} +{% load cycle from djrill_future %} + {% block extrastyle %} {{ block.super }} diff --git a/djrill/templates/djrill/urls_list.html b/djrill/templates/djrill/urls_list.html index 9214cbd..71c3e23 100644 --- a/djrill/templates/djrill/urls_list.html +++ b/djrill/templates/djrill/urls_list.html @@ -1,6 +1,8 @@ {% extends "admin/base_site.html" %} {% load admin_list i18n %} {% load url from future %} +{% load cycle from djrill_future %} + {% block extrastyle %} {{ block.super }} diff --git a/djrill/templatetags/__init__.py b/djrill/templatetags/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/djrill/templatetags/djrill_future.py b/djrill/templatetags/djrill_future.py new file mode 100644 index 0000000..0555158 --- /dev/null +++ b/djrill/templatetags/djrill_future.py @@ -0,0 +1,16 @@ +# Future templatetags library that is also backwards compatible with +# older versions of Django (so long as Djrill's code is compatible +# with the future behavior). + +from django import template + +# Django 1.8 changes autoescape behavior in cycle tag. +# Djrill has been compatible with future behavior all along. +try: + from django.templatetags.future import cycle +except ImportError: + from django.template.defaulttags import cycle + + +register = template.Library() +register.tag(cycle)