diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-04-12 09:40:06 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-04-12 09:40:06 -0400 |
| commit | f931e4762d1bac6a6ac04c48316dbafda562bfa3 (patch) | |
| tree | f506688f7525dd2b7c3399af8361a19e6680b5e3 /cherrypy/lib/jsontools.py | |
| parent | 4e58a670647973b82c872575bbffcdca444b0736 (diff) | |
| parent | d97c6d490051588cdfb3b10617e6bc8c9f66de89 (diff) | |
| download | cherrypy-git-f931e4762d1bac6a6ac04c48316dbafda562bfa3.tar.gz | |
Merge with 3.2.x
Diffstat (limited to 'cherrypy/lib/jsontools.py')
| -rw-r--r-- | cherrypy/lib/jsontools.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cherrypy/lib/jsontools.py b/cherrypy/lib/jsontools.py index 1450806a..90b3ff8a 100644 --- a/cherrypy/lib/jsontools.py +++ b/cherrypy/lib/jsontools.py @@ -1,6 +1,5 @@ -import sys import cherrypy -from cherrypy._cpcompat import basestring, ntou, json, json_encode, json_decode +from cherrypy._cpcompat import basestring, ntou, json_encode, json_decode def json_processor(entity): |