upgrade to Django 1.7

diff --git a/panikweb/paniktags/templatetags/paniktags.py b/panikweb/paniktags/templatetags/paniktags.py
index 78fa28b86735e7f325b5393cd427615a78ab45b9..a0338e1a2126a9fd93b29bd526e685a78af72596 100644 (file)
--- a/panikweb/paniktags/templatetags/paniktags.py
+++ b/panikweb/paniktags/templatetags/paniktags.py
@@ -1,5 +1,6 @@
 import email.utils
 import datetime
+import json
 import re
 import time
 import urlparse
@@ -10,7 +11,6 @@ from django import template
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.db.models.query import QuerySet
-from django.utils import simplejson
 from datetime import datetime, timedelta
 
 from emissions.models import Emission, Episode, NewsItem, SoundFile, Focus
@@ -199,7 +199,7 @@ def newsroll():
 def jsonify(object):
     if isinstance(object, QuerySet):
         return serialize('json', object)
-    return simplejson.dumps(object)
+    return json.dumps(object)
 
 @register.filter
 def strreplace ( string, args ): 

diff --git a/requirements.txt b/requirements.txt
index d8c3d14de73f56e5b8c2c606473410abd1f0b9f1..38c51026d43dce8023ff2edb8277d212b3bb102e 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
-Django<1.6
-south>=0.8,<0.9
+Django<1.8
 django-ckeditor
 git+https://github.com/toastdriven/django-haystack.git
 django-debug-toolbar<1.0.0