Removed deprecated Django 1.4 syntax

Author: Rayan

codespeed/templates/codespeed/changes.html

@@ -4,7 +4,7 @@
 {% block navigation %}
     {{ block.super }}
 {% endblock %}
-{% block nav-changes %}class="current"><a href="{% url changes %}">Changes</a>{% endblock %}
+{% block nav-changes %}class="current"><a href="{% url "changes" %}">Changes</a>{% endblock %}
 
 {% block body %}
 <div id="sidebar">
@@ -66,7 +66,7 @@
 <script type="text/javascript" src="{{ STATIC_URL }}js/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="{{ STATIC_URL }}js/changes.js"></script>
 <script type="text/javascript">
-    var TIMELINE_URL = "{% url timeline %}";
+    var TIMELINE_URL = "{% url "timeline" %}";
 
     $(function() {
         Changes.config({

codespeed/templates/codespeed/comparison.html

@@ -9,7 +9,7 @@
 {% block navigation %}
     {{ block.super }}
 {% endblock %}
-{% block nav-comparison %}class="current"><a href="{% url comparison %}">Comparison</a>{% endblock %}
+{% block nav-comparison %}class="current"><a href="{% url "comparison" %}">Comparison</a>{% endblock %}
 
 {% block body %}
 <div id="sidebar">

codespeed/templates/codespeed/timeline.html

@@ -8,7 +8,7 @@
 {% block navigation %}
     {{ block.super }}
 {% endblock %}
-{% block nav-timeline %}class="current"><a href="{% url timeline %}">Timeline</a>{% endblock %}
+{% block nav-timeline %}class="current"><a href="{% url "timeline" %}">Timeline</a>{% endblock %}
 
 {% block body %}
 <div id="sidebar">
@@ -102,7 +102,7 @@
 <script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jqplot.canvasTextRenderer.min.js"></script>
 <script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jqplot.canvasAxisLabelRenderer.min.js"></script>
 <script type="text/javascript">
-  var CHANGES_URL = "{% url changes %}";
+  var CHANGES_URL = "{% url "changes" %}";
 </script>
 <script type="text/javascript" src="{{ STATIC_URL }}js/timeline.js"></script>
 <script type="text/javascript">

codespeed/urls.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from django.conf.urls.defaults import *
 from django.core.urlresolvers import reverse
-from django.views.generic.simple import direct_to_template
+from django.views.generic import TemplateView
 from tastypie.api import Api
 
 from codespeed.feeds import LatestEntries
@@ -25,8 +25,8 @@
 rest_api.register(ResultBundleResource())
 
 urlpatterns = patterns('',
-    (r'^$', direct_to_template, {'template': 'home.html'}),
-    (r'^about/$', direct_to_template, {'template': 'about.html'}),
+    (r'^$', TemplateView.as_view(template_name='home.html')),
+    (r'^about/$', TemplateView.as_view(template_name='about.html')),
     # RSS for reports
     (r'^feeds/(?P<url>.*)/$', LatestEntries()),
 )

sample_project/templates/base.html

@@ -31,9 +31,9 @@ <h2>{% block page_title %}SPEED CENTER{% endblock page_title %}</h2>
 <div id="nav">
 {% block navigation %}
 <ul class="inline">
-  <li {% block nav-changes %}><a href=" {% url changes %}">Changes</a>{% endblock %}</li>
-  <li {% block nav-timeline %}><a href=" {% url timeline %}">Timeline</a>{% endblock %}</li>
-  <li {% block nav-comparison %}><a href=" {% url comparison %}">Comparison</a>{% endblock %}</li>
+  <li {% block nav-changes %}><a href=" {% url "changes" %}">Changes</a>{% endblock %}</li>
+  <li {% block nav-timeline %}><a href=" {% url "timeline" %}">Timeline</a>{% endblock %}</li>
+  <li {% block nav-comparison %}><a href=" {% url "comparison" %}">Comparison</a>{% endblock %}</li>
 </ul>
 {% endblock %}
 </div>

sample_project/templates/home.html

@@ -5,19 +5,19 @@
 
 {% block body %}
 <div id="presentation" class="clearfix">
-    <a href="{% url changes %}">
+    <a href="{% url "changes" %}">
         <div id="changes" class="menubox">
           <h2>Changes</h2>
           <p>Track performance changes in the latest revisions</p>
         </div>
     </a>
-    <a href="{% url timeline %}">
+    <a href="{% url "timeline" %}">
         <div id="timeline" class="menubox">
           <h2>Timeline</h2>
           <p>Analyze performance over time</p>
         </div>
     </a>
-    <a href="{% url comparison %}">
+    <a href="{% url "comparison" %}">
         <div id="comparison" class="menubox">
           <h2>Comparison</h2>
           <p>Compare different executables and revisions</p>
@@ -53,7 +53,7 @@ <h2>Comparison</h2>
 
     $(function() {
         $("#reports").html(getLoadText("Loading...", 0, true))
-            .load("{% url reports %}", function(responseText) { updateTable(); });
+            .load("{% url "reports" %}", function(responseText) { updateTable(); });
   });
 </script>
 {% endblock %}

sample_project/urls.py

@@ -4,7 +4,7 @@
 
 from django.conf import settings
 from django.conf.urls.defaults import patterns, include, handler404, handler500
-from django.views.generic.simple import redirect_to
+from django.views.generic import RedirectView
 from django.core.urlresolvers import reverse
 from django.contrib import admin
 
@@ -16,7 +16,7 @@
 
 urlpatterns += patterns(
     '',
-    #('^$', redirect_to, {'url': '/speed/'}),
+    #('^$',  RedirectView.as_view(url='/speed/')),
 )
 
 urlpatterns += patterns(

setup.py

@@ -7,7 +7,7 @@
     version='0.9.1',
     url='https://github.com/tobami/codespeed',
     license='GNU Lesser General Public License version 2.1',
-    install_requires=['django==1.4', 'isodate', 'south<=2.0', 'django-tastypie'],
+    install_requires=['django==1.5.1', 'isodate', 'south<=2.0', 'django-tastypie'],
     packages=find_packages(exclude=['ez_setup', 'sample_project']),
     description='A web application to monitor and analyze the performance of your code',
     include_package_data=True,