1 files changed, 0 insertions, 87 deletions
diff --git a/cherrypy/lib/jsontools.py b/cherrypy/lib/jsontools.py
deleted file mode 100755
index 09042e4..0000000
--- a/cherrypy/lib/jsontools.py
+++ /dev/null
@@ -1,87 +0,0 @@
-import sys
-import cherrypy
-from cherrypy._cpcompat import basestring, ntou, json, json_encode, json_decode
-
-def json_processor(entity):
-    """Read application/json data into request.json."""
-    if not entity.headers.get(ntou("Content-Length"), ntou("")):
-        raise cherrypy.HTTPError(411)
-    
-    body = entity.fp.read()
-    try:
-        cherrypy.serving.request.json = json_decode(body.decode('utf-8'))
-    except ValueError:
-        raise cherrypy.HTTPError(400, 'Invalid JSON document')
-
-def json_in(content_type=[ntou('application/json'), ntou('text/javascript')],
-            force=True, debug=False, processor = json_processor):
-    """Add a processor to parse JSON request entities:
-    The default processor places the parsed data into request.json.
-
-    Incoming request entities which match the given content_type(s) will
-    be deserialized from JSON to the Python equivalent, and the result
-    stored at cherrypy.request.json. The 'content_type' argument may
-    be a Content-Type string or a list of allowable Content-Type strings.
-    
-    If the 'force' argument is True (the default), then entities of other
-    content types will not be allowed; "415 Unsupported Media Type" is
-    raised instead.
-    
-    Supply your own processor to use a custom decoder, or to handle the parsed
-    data differently.  The processor can be configured via
-    tools.json_in.processor or via the decorator method.
-
-    Note that the deserializer requires the client send a Content-Length
-    request header, or it will raise "411 Length Required". If for any
-    other reason the request entity cannot be deserialized from JSON,
-    it will raise "400 Bad Request: Invalid JSON document".
-    
-    You must be using Python 2.6 or greater, or have the 'simplejson'
-    package importable; otherwise, ValueError is raised during processing.
-    """
-    request = cherrypy.serving.request
-    if isinstance(content_type, basestring):
-        content_type = [content_type]
-    
-    if force:
-        if debug:
-            cherrypy.log('Removing body processors %s' %
-                         repr(request.body.processors.keys()), 'TOOLS.JSON_IN')
-        request.body.processors.clear()
-        request.body.default_proc = cherrypy.HTTPError(
-            415, 'Expected an entity of content type %s' %
-            ', '.join(content_type))
-    
-    for ct in content_type:
-        if debug:
-            cherrypy.log('Adding body processor for %s' % ct, 'TOOLS.JSON_IN')
-        request.body.processors[ct] = processor
-
-def json_handler(*args, **kwargs):
-    value = cherrypy.serving.request._json_inner_handler(*args, **kwargs)
-    return json_encode(value)
-
-def json_out(content_type='application/json', debug=False, handler=json_handler):
-    """Wrap request.handler to serialize its output to JSON. Sets Content-Type.
-    
-    If the given content_type is None, the Content-Type response header
-    is not set.
-
-    Provide your own handler to use a custom encoder.  For example
-    cherrypy.config['tools.json_out.handler'] = <function>, or
-    @json_out(handler=function).
-
-    You must be using Python 2.6 or greater, or have the 'simplejson'
-    package importable; otherwise, ValueError is raised during processing.
-    """
-    request = cherrypy.serving.request
-    if debug:
-        cherrypy.log('Replacing %s with JSON handler' % request.handler,
-                     'TOOLS.JSON_OUT')
-    request._json_inner_handler = request.handler
-    request.handler = handler
-    if content_type is not None:
-        if debug:
-            cherrypy.log('Setting Content-Type to %s' % ct, 'TOOLS.JSON_OUT')
-        cherrypy.serving.response.headers['Content-Type'] = content_type
-