Add compatibility for the cycle tag.

aaugustin · aaugustin · commit b61af89b7e19 · 2015-10-06T11:53:13.000+02:00
diff --git a/debug_toolbar/templates/debug_toolbar/panels/cache.html b/debug_toolbar/templates/debug_toolbar/panels/cache.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% load cycle from future %}
+{% load i18n %}{% load cycle from debug_toolbar_compat %}
 <h4>{% trans "Summary" %}</h4>
 <table>
 	<thead>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% load cycle from future %}
+{% load i18n %}{% load cycle from debug_toolbar_compat %}
 
 <h4>{% trans "Request headers" %}</h4>
 
diff --git a/debug_toolbar/templates/debug_toolbar/panels/logging.html b/debug_toolbar/templates/debug_toolbar/panels/logging.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% load cycle from future %}
+{% load i18n %}{% load cycle from debug_toolbar_compat %}
 {% if records %}
 	<table>
 		<thead>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/request.html b/debug_toolbar/templates/debug_toolbar/panels/request.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% load cycle from future %}
+{% load i18n %}{% load cycle from debug_toolbar_compat %}
 
 <h4>{% trans "View information" %}</h4>
 <table>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/settings.html b/debug_toolbar/templates/debug_toolbar/panels/settings.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% load cycle from future %}
+{% load i18n %}{% load cycle from debug_toolbar_compat %}
 <table>
 	<thead>
 		<tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% load cycle from future %}
+{% load i18n %}{% load cycle from debug_toolbar_compat %}
 <table>
 	<thead>
 		<tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -1,4 +1,4 @@
-{% load i18n l10n %}{% load cycle from future %}{% load static from staticfiles %}
+{% load i18n l10n %}{% load cycle from debug_toolbar_compat %}{% load static from staticfiles %}
 <div class="djdt-clearfix">
 	<ul class="djdt-stats">
 		{% for alias, info in databases %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% load cycle from future %}{% load static from staticfiles %}
+{% load i18n %}{% load cycle from debug_toolbar_compat %}{% load static from staticfiles %}
 <div class="djDebugPanelTitle">
 	<a class="djDebugClose djDebugBack" href=""></a>
 	<h3>{% trans "SQL explained" %}</h3>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% load cycle from future %}{% load static from staticfiles %}
+{% load i18n %}{% load cycle from debug_toolbar_compat %}{% load static from staticfiles %}
 <div class="djDebugPanelTitle">
 	<a class="djDebugClose djDebugBack" href=""></a>
 	<h3>{% trans "SQL profiled" %}</h3>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% load cycle from future %}{% load static from staticfiles %}
+{% load i18n %}{% load cycle from debug_toolbar_compat %}{% load static from staticfiles %}
 <div class="djDebugPanelTitle">
 	<a class="djDebugClose djDebugBack" href=""></a>
 	<h3>{% trans "SQL selected" %}</h3>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/staticfiles.html b/debug_toolbar/templates/debug_toolbar/panels/staticfiles.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% load cycle from future %}{% load static from staticfiles%}
+{% load i18n %}{% load cycle from debug_toolbar_compat %}{% load static from staticfiles%}
 
 <h4>{% blocktrans count staticfiles_dirs|length as dirs_count %}Static file path{% plural %}Static file paths{% endblocktrans %}</h4>
 {% if staticfiles_dirs %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% load cycle from future %}{% load static from staticfiles %}
+{% load i18n %}{% load cycle from debug_toolbar_compat %}{% load static from staticfiles %}
 <h4>{% trans "Resource usage" %}</h4>
 <table>
 	<colgroup>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/versions.html b/debug_toolbar/templates/debug_toolbar/panels/versions.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% load cycle from future %}
+{% load i18n %}{% load cycle from debug_toolbar_compat %}
 <table>
 	<thead>
 		<tr>
diff --git a/debug_toolbar/templatetags/__init__.py b/debug_toolbar/templatetags/__init__.py
diff --git a/debug_toolbar/templatetags/debug_toolbar_compat.py b/debug_toolbar/templatetags/debug_toolbar_compat.py
@@ -0,0 +1,13 @@
+import django
+from django.template import Library
+
+if django.VERSION >= (1, 8):
+    from django.template.defaulttags import cycle
+else:
+    from django.templatetags.future import cycle
+
+
+register = Library()
+
+
+cycle = register.tag(cycle)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% load i18n %}{% load cycle from future %}`
	`1`	`+{% load i18n %}{% load cycle from debug_toolbar_compat %}`
`2`	`2`	`<h4>{% trans "Summary" %}</h4>`
`3`	`3`	`<table>`
`4`	`4`	`<thead>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% load i18n l10n %}{% load cycle from future %}{% load static from staticfiles %}`
	`1`	`+{% load i18n l10n %}{% load cycle from debug_toolbar_compat %}{% load static from staticfiles %}`
`2`	`2`	`<div class="djdt-clearfix">`
`3`	`3`	`<ul class="djdt-stats">`
`4`	`4`	`{% for alias, info in databases %}`