Mercurial > public > sg101

diff messages/views.py @ 679:89b240fe9297

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
For Django 1.5.2: import json; django.utils.simplejson is deprecated.
author Brian Neal <bgneal@gmail.com>
date Thu, 15 Aug 2013 20:14:33 -0500
parents ee87ea74d46b
children 6bbd1473d48e
line wrap: on
line diff
--- a/messages/views.py	Wed Aug 14 14:53:21 2013 -0500
+++ b/messages/views.py	Thu Aug 15 20:14:33 2013 -0500
@@ -3,6 +3,7 @@
 
 """
 import datetime
+import json
 
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
@@ -14,7 +15,6 @@
 from django.http import HttpResponseNotAllowed
 from django.shortcuts import get_object_or_404
 from django.shortcuts import render
-import django.utils.simplejson as json
 
 from messages.models import Message, Options
 from messages.forms import OptionsForm, ComposeForm