Merge pull request #22 from p1otr/master

use stdlib's json module if simplejson is missing

fabfile.py

@@ -7,7 +7,10 @@
 # plinth box
 
 import os,sys, subprocess
-import simplejson as json
+try:
+    import simplejson as json
+except ImportError:
+    import json
 import fabric.api
 from fabric.api import local, env, cd, put, get, task
 

filedict.py

@@ -5,7 +5,10 @@ Author: Erez Shinan
 Date  : 31-May-2009
 """
 
-import simplejson as json ## jlv replaced pickle with json
+try:
+    import simplejson as json ## jlv replaced pickle with json
+except ImportError:
+    import json
  
 import UserDict
 ##import cPickle as pickle

menu.py

@@ -1,5 +1,8 @@
-import simplejson as json
 from urlparse import urlparse
+try:
+    import simplejson as json
+except ImportError:
+    import json
 import cherrypy
 import cfg
 

modules/installed/lib/user_store.py

@@ -1,5 +1,8 @@
 import os
-import simplejson as json
+try:
+    import simplejson as json
+except ImportError:
+    import json
 import cherrypy
 import cfg
 from model import User

modules/installed/santiago/santiago.py

@@ -7,7 +7,10 @@ haven't figured that one all the way through yet.
 
 import os, sys
 import cherrypy
-import simplejson as json
+try:
+    import simplejson as json
+except ImportError:
+    import json
 from gettext import gettext as _
 from plugin_mount import PagePlugin
 from modules.auth import require

modules/installed/system/config.py

@@ -1,7 +1,10 @@
 import os, subprocess
 from socket import gethostname
 import cherrypy
-import simplejson as json
+try:
+    import simplejson as json
+except ImportError:
+    import json
 from gettext import gettext as _
 from filedict import FileDict
 from modules.auth import require

modules/installed/system/expert_mode.py

@@ -1,6 +1,9 @@
 import os
 import cherrypy
-import simplejson as json
+try:
+    import simplejson as json
+except ImportError:
+    import json
 from gettext import gettext as _
 from filedict import FileDict
 from modules.auth import require

modules/installed/system/system.py

@@ -1,6 +1,9 @@
 import os
 import cherrypy
-import simplejson as json
+try:
+    import simplejson as json
+except ImportError:
+    import json
 from gettext import gettext as _
 from filedict import FileDict
 from auth import require

modules/installed/system/wan.py

@@ -1,6 +1,9 @@
 import os
 import cherrypy
-import simplejson as json
+try:
+    import simplejson as json
+except ImportError:
+    import json
 from gettext import gettext as _
 from filedict import FileDict
 from modules.auth import require