Fix RemovedInDjango19Warning and other warnings. Fixes #396 #365 #383

darklow · Jul 23, 2015 · 868b4ab · 868b4ab
1 parent 2121da8
commit 868b4ab
Show file tree

Hide file tree

Showing 30 changed files with 61 additions and 32 deletions.
diff --git a/suit/admin.py b/suit/admin.py
@@ -6,11 +6,7 @@
 from django.contrib import admin
 from django.db import models
 from suit.widgets import NumberInput, SuitSplitDateTimeWidget
-try:
-    # Django 1.8 +
-    from django.contrib.contenttypes import admin as ct_admin
-except ImportError:
-    from django.contrib.contenttypes import generic as ct_admin
+from suit.compat import ct_admin
 
 
 class SortableModelAdminBase(object):

diff --git a/suit/compat.py b/suit/compat.py
@@ -0,0 +1,24 @@
+"""
+This file exists to contain all Django and Python compatibility issues.
+In order to avoid circular references, nothing should be imported from suit lib.
+
+Based on:
+https://github.com/django-debug-toolbar/django-debug-toolbar/blob/master/debug_toolbar/compat.py
+
+"""
+import django
+
+try:
+    from importlib import import_module
+except ImportError:  # python = 2.6
+    from django.utils.importlib import import_module  # Django < 1.9
+
+if django.VERSION[:2] < (1, 5):
+    from django.templatetags.future import url
+else:
+    from django.template.defaulttags import url
+
+try:
+    from django.contrib.contenttypes import admin as ct_admin
+except ImportError:
+    from django.contrib.contenttypes import generic as ct_admin  # Django < 1.8
diff --git a/suit/templates/admin/app_index.html b/suit/templates/admin/app_index.html
@@ -1,6 +1,6 @@
 {% extends "admin/index.html" %}
 {% load i18n %}
-{% load url from future %}
+{% load url from suit_compat %}
 
 {% if not is_popup %}
     {% block breadcrumbs %}

diff --git a/suit/templates/admin/auth/user/change_password.html b/suit/templates/admin/auth/user/change_password.html
@@ -1,6 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_static admin_modify admin_urls %}
-{% load url from future %}
+{% load url from suit_compat %}
 
 {% block extrahead %}{{ block.super }}
   {% url 'admin:jsi18n' as jsi18nurl %}

diff --git a/suit/templates/admin/base.html b/suit/templates/admin/base.html
@@ -1,4 +1,4 @@
-{% load admin_static %}{% load suit_tags %}{% load url from future %}<!DOCTYPE html>
+{% load admin_static %}{% load suit_tags %}{% load url from suit_compat %}<!DOCTYPE html>
 <html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
 <head>
   <meta http-equiv="X-UA-Compatible" content="IE=edge">

diff --git a/suit/templates/admin/change_form.html b/suit/templates/admin/change_form.html
@@ -1,6 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_static admin_modify suit_tags admin_urls %}
-{% load url from future %}
+{% load url from suit_compat %}
 
 {% block extrahead %}{{ block.super }}
   {% url 'admin:jsi18n' as jsi18nurl %}

diff --git a/suit/templates/admin/change_list.html b/suit/templates/admin/change_list.html
@@ -1,6 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_static admin_list admin_urls suit_list suit_tags %}
-{% load url from future %}
+{% load url from suit_compat %}
 
 {% block extrastyle %}
   {{ block.super }}

diff --git a/suit/templates/admin/cms/page/change_form.html b/suit/templates/admin/cms/page/change_form.html
@@ -1,6 +1,6 @@
 {% extends "admin/change_form.html" %}
 {% load i18n admin_modify cms_tags cms_admin %}
-{% load url from future %}
+{% load url from suit_compat %}
 {% block title %}{% trans "Change a page" %}{% endblock %}
 
 {% block extrahead %}

diff --git a/suit/templates/admin/cms/page/plugin_change_form.html b/suit/templates/admin/cms/page/plugin_change_form.html
@@ -1,6 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_modify cms_admin %}
-{% load url from future %}
+{% load url from suit_compat %}
 {% block extrahead %}{{ block.super }}
 
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}suit/css/djangocms.css">

diff --git a/suit/templates/admin/delete_confirmation.html b/suit/templates/admin/delete_confirmation.html
@@ -1,6 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_urls %}
-{% load url from future %}
+{% load url from suit_compat %}
 
 {% block breadcrumbs %}
   <ul class="breadcrumb">

diff --git a/suit/templates/admin/delete_selected_confirmation.html b/suit/templates/admin/delete_selected_confirmation.html
@@ -1,6 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n l10n admin_urls %}
-{% load url from future %}
+{% load url from suit_compat %}
 
 {% block breadcrumbs %}
   <ul class="breadcrumb">

diff --git a/suit/templates/admin/filer/breadcrumbs.html b/suit/templates/admin/filer/breadcrumbs.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% load url from future %}
+{% load url from suit_compat %}
 <ul class="breadcrumb">
     <li>
         <a href="{% url 'admin:index' %}" title="{% trans "Go back to admin homepage" %}">{% trans "Home" %}</a>

diff --git a/suit/templates/admin/filer/delete_confirmation.html b/suit/templates/admin/filer/delete_confirmation.html
@@ -1,6 +1,6 @@
 {% extends "admin/filer/base_site.html" %}
 {% load i18n %}
-{% load url from future %}
+{% load url from suit_compat %}
 
 {% block breadcrumbs %}
 {% include "admin/filer/breadcrumbs.html" with instance=object breadcrumbs_action="Delete" %}

diff --git a/suit/templates/admin/filer/folder/change_form.html b/suit/templates/admin/filer/folder/change_form.html
@@ -1,6 +1,6 @@
 {% extends "admin/change_form.html" %}
 {% load i18n admin_modify filermedia %}
-{% load url from future %}
+{% load url from suit_compat %}
 
 {% block breadcrumbs %}
     <ul class="breadcrumb">

diff --git a/suit/templates/admin/filer/folder/directory_listing.html b/suit/templates/admin/filer/folder/directory_listing.html
@@ -1,6 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load filer_admin_tags filermedia i18n %}
-{% load url from future %}
+{% load url from suit_compat %}
 
 {% block extrahead %}{{ block.super }}
 {# upload stuff #}

diff --git a/suit/templates/admin/filer/folder/directory_table.html b/suit/templates/admin/filer/folder/directory_table.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 {% load admin_list filermedia filer_tags %}
-{% load url from future %}
+{% load url from suit_compat %}
 
 <div id="toolbartable" class="results">
       <table id="result_list" class="table table-striped table-bordered table-hover table-condensed">

diff --git a/suit/templates/admin/filer/tools/clipboard/clipboard.html b/suit/templates/admin/filer/tools/clipboard/clipboard.html
@@ -1,5 +1,5 @@
 {% load thumbnail i18n %}
-{% load url from future %}
+{% load url from suit_compat %}
 
 <h4 class="italic-title clipboard-header{{ folder.is_root|yesno:' clipboard-root,' }}">{% trans "Clipboard" %}</h4>
 {% for clipboard in user.filer_clipboards.all %}

diff --git a/suit/templates/admin/import_export/base.html b/suit/templates/admin/import_export/base.html
@@ -1,7 +1,7 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_static admin_modify %}
 {% load admin_urls %}
-{% load url from future %}
+{% load url from suit_compat %}
 
 {% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %}
 {% if not is_popup %}

diff --git a/suit/templates/admin/import_export/export.html b/suit/templates/admin/import_export/export.html
@@ -1,5 +1,5 @@
 {% extends "admin/import_export/base.html" %}
-{% load url from future %}
+{% load url from suit_compat %}
 {% load i18n admin_urls import_export_tags %}
 
 {% block breadcrumbs_last %}{% trans "Export" %}{% endblock %}

diff --git a/suit/templates/admin/import_export/import.html b/suit/templates/admin/import_export/import.html
@@ -1,5 +1,5 @@
 {% extends "admin/import_export/base.html" %}
-{% load url from future %}
+{% load url from suit_compat %}
 {% load i18n admin_urls import_export_tags %}
 
 {% block breadcrumbs_last %}

diff --git a/suit/templates/admin/login.html b/suit/templates/admin/login.html
@@ -1,6 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_static suit_tags %}
-{% load url from future %}
+{% load url from suit_compat %}
 
 {% block extrastyle %}{{ block.super }}
     {#    <link rel="stylesheet" type="text/css" href="{% static "admin/css/login.css" %}" />#}

diff --git a/suit/templates/admin/object_history.html b/suit/templates/admin/object_history.html
@@ -1,6 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_urls %}
-{% load url from future %}
+{% load url from suit_compat %}
 
 {% block breadcrumbs %}
 <div class="breadcrumb">

diff --git a/suit/templates/registration/logged_out.html b/suit/templates/registration/logged_out.html
@@ -1,6 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n %}
-{% load url from future %}
+{% load url from suit_compat %}
 
 {% block breadcrumbs %}
     <div class="breadcrumbs"><a href="{% url 'admin:index' %}">{% trans 'Home' %}</a></div>{% endblock %}

diff --git a/suit/templates/registration/password_change_form.html b/suit/templates/registration/password_change_form.html
@@ -1,6 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load i18n static %}
-{% load url from future %}
+{% load url from suit_compat %}
 
 {% block extrastyle %}{{ block.super }}
   {#    <link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}"/>#}

diff --git a/suit/templates/reversion/recover_form.html b/suit/templates/reversion/recover_form.html
@@ -1,5 +1,5 @@
 {% extends "reversion/revision_form.html" %}
-{% load url from future %}
+{% load url from suit_compat %}
 {% load i18n %}
 
 

diff --git a/suit/templates/reversion/recover_list.html b/suit/templates/reversion/recover_list.html
@@ -1,5 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load url from future %}
+{% load url from suit_compat %}
 {% load i18n %}
 
 

diff --git a/suit/templates/reversion/revision_form.html b/suit/templates/reversion/revision_form.html
@@ -1,5 +1,5 @@
 {% extends "admin/change_form.html" %}
-{% load url from future %}
+{% load url from suit_compat %}
 {% load i18n %}
 
 

diff --git a/suit/templates/suit/error_base.html b/suit/templates/suit/error_base.html
@@ -1,4 +1,4 @@
-{% load admin_static i18n %}{% load url from future %}<!DOCTYPE html>
+{% load admin_static i18n %}{% load url from suit_compat %}<!DOCTYPE html>
 <!--[if lt IE 9 ]><html lang="en"> <![endif]-->
 <!--[if (gte IE 9)|!(IE)]><!-->
 <html lang="en" xmlns="http://www.w3.org/1999/html"> <!--<![endif]-->

diff --git a/suit/templates/suit/menu.html b/suit/templates/suit/menu.html
@@ -1,6 +1,6 @@
 {#{% load sitetree %}#}
 {% load i18n suit_menu %}
-{% load url from future %}
+{% load url from suit_compat %}
 
 <div class="left-nav" id="left-nav">
   <ul>

diff --git a/suit/templatetags/suit_compat.py b/suit/templatetags/suit_compat.py
@@ -0,0 +1,9 @@
+from django.template.base import Library
+from ..compat import url as url_compat
+
+register = Library()
+
+
+@register.tag
+def url(parser, token):
+    return url_compat(parser, token)