Update to Django 1.6

go/account/templates/account/index.html

@@ -1,5 +1,4 @@
 {% extends "app.html" %}
-{% load markup %}
 {% load flatpages %}
 
 {% block page_title %}

go/account/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from go.account import views
 

go/api/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from go.api import views
 

go/apps/jsbox/forms.py

@@ -1,5 +1,5 @@
 from django import forms
-from django.forms.formsets import BaseFormSet, DEFAULT_MAX_NUM
+from django.forms.formsets import BaseFormSet, formset_factory
 
 from go.base.widgets import CodeField, SourceUrlField
 
@@ -48,13 +48,7 @@ def to_config(self):
         }
 
 
-class JsboxAppConfigFormset(BaseFormSet):
-    form = JsboxAppConfigForm
-    absolute_max = DEFAULT_MAX_NUM
-    extra = 1
-    can_order = False
-    can_delete = True
-    max_num = None
+class BaseJsboxAppConfigFormset(BaseFormSet):
 
     def to_config(self):
         metadata = {}
@@ -76,3 +70,7 @@ def initial_from_config(cls, metadata):
                 submeta = getattr(cls.form, 'initial_from_config')(submeta)
             initials.append(submeta)
         return initials
+
+JsboxAppConfigFormset = formset_factory(
+    JsboxAppConfigForm, can_delete=True, extra=1,
+    formset=BaseJsboxAppConfigFormset)

go/apps/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls import patterns, url, include
 
 urlpatterns = patterns('',
     url(r'^survey/',

go/billing/admin.py

@@ -1,5 +1,5 @@
 from django.core import urlresolvers
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 from django.http import HttpResponseRedirect
 from django.template.response import TemplateResponse
 from django.forms.models import modelformset_factory

go/channel/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from go.channel import views
 
 urlpatterns = patterns('',

go/channel/view_definition.py

@@ -95,7 +95,7 @@ def display_name(self):
     def get_view_url(self, view_name, channel_key):
         kwargs = {
             'path_suffix': self._view_mapping[view_name].path_suffix,
-            'channel_key': urllib.quote(channel_key),
+            'channel_key': channel_key,
         }
         return reverse('channels:channel', kwargs=kwargs)
 

go/contacts/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from go.contacts import views
 
 urlpatterns = patterns('',

go/conversation/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from go.conversation import views
 
 urlpatterns = patterns(

go/dashboard/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from go.dashboard import views
 

go/router/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from go.router import views
 
 urlpatterns = patterns('',

go/settings.py

@@ -150,7 +150,6 @@ def static_paths(paths):
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.flatpages',
-    'django.contrib.markup',
     'django.contrib.humanize',
     # Uncomment the next line to enable the admin:
     'django.contrib.admin',

go/templates/flatpages/default.html

@@ -1,9 +1,8 @@
 {% extends "app.html" %}
-{% load markup %}
 
 {% block page_title %}Vumi Go: {{flatpage.title}}{% endblock %}
 {% block content_title %}{{flatpage.title}}{% endblock %}
 
 {% block content_main %}
-{{flatpage.content|markdown}}
+{{flatpage.content}}
 {% endblock %}

go/token/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from go.token import views
 

go/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls import patterns, include, url
 from django.contrib import admin
 from django.http import HttpResponse
 from django.views.generic import RedirectView

go/wizard/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from go.wizard import views
 
 urlpatterns = patterns(

setup.py

@@ -19,7 +19,7 @@
         # installed before us. They're listed first so that we fail fast
         # instead of working through all the other requirements before
         # discovering that they aren't available should that be the case.
-        'Django==1.5.5',
+        'Django>=1.6,<1.7',
         'gunicorn==0.15.0',
         'South==0.8.2',
         'psycopg2==2.4',
@@ -33,9 +33,9 @@
         'requests==0.14.2',
         'mock==1.0.1',
         'raven>=2.0,<3.0',
-        'django-debug-toolbar==0.9.4',
+        'django-debug-toolbar',
         'kombu==2.5.6',
-        'librabbitmq==1.0.1',
+        'librabbitmq',
         'hiredis==0.1.1',
         'django-pipeline==1.3.6',
         'txpostgres==1.1.0',