json(indent=...) parameter

gluon/globals.py

@@ -644,10 +644,10 @@ class Response(Storage):
                 'attachment; filename="%s"' % download_filename.replace('"', '\"')
         return self.stream(stream, chunk_size=chunk_size, request=request)
 
-    def json(self, data, default=None):
+    def json(self, data, default=None, indent=None):
         if 'Content-Type' not in self.headers:
             self.headers['Content-Type'] = 'application/json'
-        return json(data, default=default or custom_json)
+        return json(data, default=default or custom_json, indent=indent)
 
     def xmlrpc(self, request, methods):
         from gluon.xmlrpc import handler

gluon/serializers.py

@@ -119,8 +119,8 @@ def xml(value, encoding='UTF-8', key='document', quote=True):
     return ('<?xml version="1.0" encoding="%s"?>' % encoding) + str(xml_rec(value, key, quote))
 
 
-def json(value, default=custom_json):
+def json(value, default=custom_json, indent=None):
-    value = json_parser.dumps(value, default=default)
+    value = json_parser.dumps(value, default=default, sort_keys=True, indent=indent)
     # replace JavaScript incompatible spacing
     # http://timelessrepo.com/json-isnt-a-javascript-subset
     # PY3 FIXME