fix some warning for next django release

foxmask · Apr 12, 2015 · 5c0944c · 5c0944c
1 parent 123b2e5
commit 5c0944c
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 21 deletions.
diff --git a/django_th/settings.py b/django_th/settings.py
@@ -126,6 +126,10 @@
     # Uncomment the next line to enable the service:
     # 'th_twitter', #then do pip install python-twitter
     # 'th_readability', #then do pip install readability-api
+
+    # Uncomment the next line to enable the feature
+    # 'th_holidays',
+    # then do pip install django-th-holidays
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (

diff --git a/django_th/templates/base.html b/django_th/templates/base.html
@@ -3,7 +3,6 @@
 {% load static %}
 {% load staticfiles %}
 {% load i18n %}
-{% load url from future %}
 {% load django_th_extras %}    
 <head>
     <meta charset="utf-8">

diff --git a/django_th/templates/home.html b/django_th/templates/home.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 {% load static %}
-{% load url from future %}
 {% load i18n %}
 {% load django_th_extras %}
 

diff --git a/django_th/templates/registration/login.html b/django_th/templates/registration/login.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block title %}{% trans "Log in" %}{% endblock %}
 {% block content %}

diff --git a/django_th/templates/services/add_service.html b/django_th/templates/services/add_service.html
@@ -1,8 +1,6 @@
 {% extends "base.html" %}
 {% load static %}
-{% load url from future %}
 {% load i18n %}
-{% load django_th_extras %}
 {% block title %}{% trans "My Services" %} - {{ user.username }}{% endblock %}
 {% block content %}
     <div class="col-md-12" id="trigger-content">

diff --git a/django_th/templates/services/delete_service.html b/django_th/templates/services/delete_service.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 {% load static %}
-{% load url from future %}
 {% load i18n %}
 {% load django_th_extras %}
 {% block title %}{% trans "My Services" %} - {{ user.username }}{% endblock %}

diff --git a/django_th/templates/services/services.html b/django_th/templates/services/services.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 {% load static %}
-{% load url from future %}
 {% load i18n %}
 {% load django_th_extras %}
 {% block title %}{% trans "My Activated Services" %} - {{ user.username }}{% endblock %}

diff --git a/django_th/templates/services/thanks_service.html b/django_th/templates/services/thanks_service.html
@@ -1,8 +1,6 @@
 {% extends "base.html" %}
 {% load static %}
-{% load url from future %}
 {% load i18n %}
-{% load django_th_extras %}
 {% block title %}{% trans "My Services" %} - {{ user.username }}{% endblock %}
 {% block content %}
     <div class="span12" id="trigger-content">

diff --git a/django_th/templates/triggers/delete_trigger.html b/django_th/templates/triggers/delete_trigger.html
@@ -1,8 +1,6 @@
 {% extends "base.html" %}
 {% load static %}
-{% load url from future %}
 {% load i18n %}
-{% load django_th_extras %}
 {% block title %}{% trans "My Triggers" %} - {{ user.username }}{% endblock %}
 {% block content %}
     <div class="col-md-12" id="trigger-content">

diff --git a/django_th/templates/triggers/edit_description_trigger.html b/django_th/templates/triggers/edit_description_trigger.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 {% load static %}
-{% load url from future %}
 {% load i18n %}
 {% block title %}{% trans "My Services" %} - {{ user.username }}{% endblock %}
 {% block content %}

diff --git a/django_th/templates/triggers/thanks_trigger.html b/django_th/templates/triggers/thanks_trigger.html
@@ -1,8 +1,6 @@
 {% extends "base.html" %}
 {% load static %}
-{% load url from future %}
 {% load i18n %}
-{% load django_th_extras %}
 {% block title %}{% trans "My Trigger" %} - {{ user.username }}{% endblock %}
 {% block content %}
     <div class="span12" id="trigger-content">

diff --git a/django_th/templates/triggers/trigger_line.html b/django_th/templates/triggers/trigger_line.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load url from future %}
 {% load django_th_extras %}
                 <a class="btn btn-lg btn-info" role="button" href="{% url 'edit_provider' trigger.id %}" title="{{ title }} {{ trigger.provider.name|service_readable|lower }}" ><span class="glyphicon glyphicon-pencil icon-white"></span> {{ trigger.provider.name|service_readable|lower }}</a>
 

diff --git a/django_th/urls.py b/django_th/urls.py
@@ -132,10 +132,4 @@
                  {'service_name': 'ServiceTwitter', },
                  name="twitter_callback",
                  ),
-             url(r"^th/callbackfacebook/$",
-                 "django_th.views.finalcallback",
-                 {'service_name': 'ServiceFacebook', },
-                 name="facebook_callback",
-                 ),
-
              )