Commit 0398212a authored by fred's avatar fred

upgrade to Django 1.7

parent 5042c1ba
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 ):
......
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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment