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'