summaryrefslogtreecommitdiff
path: root/cherrypy/lib/jsontools.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-07-08 21:41:55 -0400
committerJason R. Coombs <jaraco@jaraco.com>2017-07-08 21:41:55 -0400
commit7076aa477ffc58df25da33d37b775115e99d606c (patch)
tree2962537d3209ed0f75fb351a7d32cde9cd05bf72 /cherrypy/lib/jsontools.py
parent7db33662074b2d79a995df83cd07231379e42685 (diff)
downloadcherrypy-git-7076aa477ffc58df25da33d37b775115e99d606c.tar.gz
Remove Python 2.5 comments
Diffstat (limited to 'cherrypy/lib/jsontools.py')
-rw-r--r--cherrypy/lib/jsontools.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/cherrypy/lib/jsontools.py b/cherrypy/lib/jsontools.py
index 91ea74e1..48683097 100644
--- a/cherrypy/lib/jsontools.py
+++ b/cherrypy/lib/jsontools.py
@@ -34,9 +34,6 @@ def json_in(content_type=[ntou('application/json'), ntou('text/javascript')],
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, text_or_bytes):
@@ -72,9 +69,6 @@ def json_out(content_type='application/json', debug=False,
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
# request.handler may be set to None by e.g. the caching tool