|
@@ -5,7 +5,7 @@ from django.http import HttpResponse
|
|
from django.core import serializers
|
|
from django.core import serializers
|
|
from world.models import World, Fortune
|
|
from world.models import World, Fortune
|
|
from django.shortcuts import render
|
|
from django.shortcuts import render
|
|
-import ujson
|
|
|
|
|
|
+from ujson import dumps as uj_dumps
|
|
import random
|
|
import random
|
|
from operator import attrgetter
|
|
from operator import attrgetter
|
|
import numpy.random as nprnd
|
|
import numpy.random as nprnd
|
|
@@ -15,7 +15,7 @@ def json(request):
|
|
response = {
|
|
response = {
|
|
"message": "Hello, World!"
|
|
"message": "Hello, World!"
|
|
}
|
|
}
|
|
- return HttpResponse(ujson.dumps(response), mimetype="application/json")
|
|
|
|
|
|
+ return HttpResponse(uj_dumps(response), mimetype="application/json")
|
|
|
|
|
|
def db(request):
|
|
def db(request):
|
|
queries = int(request.GET.get('queries', 1))
|
|
queries = int(request.GET.get('queries', 1))
|
|
@@ -43,7 +43,7 @@ def db(request):
|
|
# by creating dicts, we don't need to user the model serializer, which is probably slow and only appropriate
|
|
# by creating dicts, we don't need to user the model serializer, which is probably slow and only appropriate
|
|
# for complicated serializations of joins and crazy query sets etc
|
|
# for complicated serializations of joins and crazy query sets etc
|
|
# test xrange vs range if the query number is gigantic
|
|
# test xrange vs range if the query number is gigantic
|
|
- worlds = ujson.dumps([{'id' : r, 'randomNumber' : g(id=r).randomnumber} for r in [rp() for q in xrange(queries)]])
|
|
|
|
|
|
+ worlds = uj_dumps([{'id' : r, 'randomNumber' : g(id=r).randomnumber} for r in [rp() for q in xrange(queries)]])
|
|
return HttpResponse(worlds, mimetype="application/json")
|
|
return HttpResponse(worlds, mimetype="application/json")
|
|
|
|
|
|
def fortunes(request):
|
|
def fortunes(request):
|