Switch simplejson to json

Avoids one import...
T#

diff --git a/pgcommitfest/auth.py b/pgcommitfest/auth.py
index 6ee9719036b3ad3484b4b56e7edacf75aeffa8a4..13ada6a0cc36933efc6773c8d9e602606a631525 100644 (file)
--- a/pgcommitfest/auth.py
+++ b/pgcommitfest/auth.py
@@ -26,7 +26,7 @@ from django.contrib.auth import logout as django_logout
 from django.conf import settings
 
 import base64
-import simplejson
+import json
 import socket
 import urlparse
 import urllib
@@ -200,6 +200,6 @@ def user_search(searchterm=None, userid=None):
                                                AES.MODE_CBC,
                                                base64.b64decode(ivs, "-_"))
        s = decryptor.decrypt(base64.b64decode(datas, "-_")).rstrip(' ')
-       j = simplejson.loads(s)
+       j = json.loads(s)
 
        return j

diff --git a/pgcommitfest/commitfest/ajax.py b/pgcommitfest/commitfest/ajax.py
index bc6817dfbc026e72bbf508d2e08bf3a4ce1ee456..c033027a04f59c56a319847bd677e1ba3b100f89 100644 (file)
--- a/pgcommitfest/commitfest/ajax.py
+++ b/pgcommitfest/commitfest/ajax.py
@@ -9,7 +9,7 @@ from django.db import transaction
 import httplib
 import socket
 import urllib
-import simplejson
+import json
 
 from auth import user_search
 
@@ -42,7 +42,7 @@ def _archivesAPI(suburl, params=None):
                                raise Http404()
                        raise Exception("JSON call failed: %s" % resp.status)
 
-               r = simplejson.load(resp)
+               r = json.load(resp)
                resp.close()
                h.close()
        except socket.error, e:
@@ -244,7 +244,7 @@ def main(request, command):
                raise Http404
        try:
                resp = HttpResponse(content_type='application/json')
-               simplejson.dump(_ajax_map[command](request), resp)
+               json.dump(_ajax_map[command](request), resp)
                return resp
        except Http503, e:
                return HttpResponseServiceUnavailable(e, mimetype='text/plain')