remove simplejson

applications/admin/LICENSE

@@ -39,25 +39,6 @@ web2py contains third party software under the gluon/contrib/ folder.
 Each file/module in contrib is distributed with web2py under its original license.
 Here we list some of them.
 
-#### gluon.contrib.simplejson LICENSE
-
-Copyright (c) 2006 Bob Ippolito - Permission is hereby granted, free of charge, 
-to any person obtaining a copy of this software and associated documentation 
-files (the "Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom 
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
 #### gluon.contrib.rss2.py (originally PyRSS2Gen) LICENSE
 
 This is copyright (c) by Dalke Scientific Software, LLC and released under the

applications/admin/controllers/wizard.py

@@ -80,7 +80,7 @@ def index():
 
 
 def step1():
-    from gluon.contrib.simplejson import loads
+    from json import loads
     import urllib
     if not session.themes:
         #url = LAYOUTS_APP + '/default/layouts.json'

applications/examples/controllers/simple_examples.py

@@ -56,8 +56,7 @@ def servejs():
     return 'alert("This is a Javascript document, it is not supposed to run!");'
 
 def makejson():
-    import gluon.contrib.simplejson as sj
-    return sj.dumps(['foo', {'bar': ('baz', None, 1.0, 2)}])
+    return response.json(['foo', {'bar': ('baz', None, 1.0, 2)}])
 
 
 def makertf():

applications/examples/views/default/examples.html

@@ -134,7 +134,7 @@ def servejs():
     def makejson():
         return response.json(['foo', {'bar': ('baz', None, 1.0, 2)}])
     """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
-    <p>If you are into Ajax, web2py includes gluon.contrib.<a href="http://cheeseshop.python.org/pypi/simplejson">simplejson</a>, developed by Bob Ippolito. This module provides a fast and easy way to serve asynchronous content to your Ajax page. gluon.simplesjson.dumps(...) can serialize most Python types into <a href="http://www.json.org">JSON</a>. gluon.contrib.simplejson.loads(...) performs the reverse operation.
+    <p>If you are into Ajax, <a href="http://www.json.org">JSON</a> is fully supported in web2py. Providing a fast and easy way to serve asynchronous content to your Ajax page. Response.json can serialize most Python types into JSON.
     <br/>Try it here: <a class="btn" href="/{{=request.application}}/simple_examples/makejson">makejson</a></p>
 
     <p>New in web2py 1.63: Any normal action returning a dict is automatically serialized in JSON if '.json' is appended to the URL.</p>

applications/examples/views/default/who.html

@@ -149,8 +149,7 @@
 
 <li><a href="http://www.python.org">Python</a> created by Guido van Rossum.</li>
 <li>Rocket Web Server developed by Timothy Farrell.</li>
-<li><a href="http://codemirror.net/">CodeMirror</a></li>
-<li><a href="http://cheeseshop.python.org/pypi/simplejson">simplejson</a> developed by Bob Ippolito</li>
+<li><a href="http://codemirror.net/">CodeMirror</a></li>s
 <li><a href="http://pyrtf.sourceforge.net/">PyRTF</a> developed by Simon Cusack and revised by Grant Edwards</li>
 <li><a href="http://www.dalkescientific.com/Python/PyRSS2Gen.html">PyRSS2Gen</a> developed by Dalke Scientific Software</li>
 <li><a href="http://www.feedparser.org/">feedparser</a> developed by Mark Pilgrim</li>