Json

INSTALL

@@ -5,7 +5,7 @@
 Install the python-cheetah package, pandoc, python-augeas, and
 bjsonrpc:
 
-apt-get install python-cheetah pandoc python-augeas python-bjsonrpc python-cherrypy3 python-simplejson
+apt-get install python-cheetah pandoc python-augeas python-bjsonrpc python-cherrypy3
 
 Unzip and untar the source into a directory.  Change to the directory
 containing the program. Run:

Makefile

@@ -10,7 +10,7 @@ default: predepend config dirs template css docs dbs
 all: default
 
 predepend:
-	sudo sh -c "apt-get install augeas-tools python-bjsonrpc python-augeas python-simplejson pandoc python-cheetah python-cherrypy3"
+	sudo sh -c "apt-get install augeas-tools python-bjsonrpc python-augeas pandoc python-cheetah python-cherrypy3"
 	git submodule init
 	git submodule update
 	touch predepend

fabfile.py

@@ -7,6 +7,11 @@
 # plinth box
 
 import os,sys, subprocess
+if sys.version_info >= (2, 6):
+    import json
+else:
+    import simplejson as json
+
 import simplejson as json
 import fabric.api
 from fabric.api import local, env, cd, put, get, task

filedict.py

@@ -5,7 +5,12 @@
 Date  : 31-May-2009
 """
 
-import simplejson as json ## jlv replaced pickle with json
+import sys
+## jlv replaced pickle with json
+if sys.version_info >= (2, 6):
+    import json
+else:
+    import simplejson as json
 
 import UserDict
 ##import cPickle as pickle

menu.py

@@ -1,4 +1,9 @@
-import simplejson as json
+
+import sys
+if sys.version_info >= (2, 6):
+    import json
+else:
+    import simplejson as json
 from urlparse import urlparse
 import cherrypy
 import cfg

modules/installed/lib/user_store.py

@@ -1,5 +1,9 @@
 import os
-import simplejson as json
+import sys
+if sys.version_info >= (2, 6):
+    import json
+else:
+    import simplejson as json
 import cherrypy
 import cfg
 from model import User

modules/installed/santiago/santiago.py

@@ -7,7 +7,10 @@
 
 import os, sys
 import cherrypy
-import simplejson as json
+if sys.version_info >= (2, 6):
+    import json
+else:
+    import simplejson as json
 from gettext import gettext as _
 from plugin_mount import PagePlugin
 from modules.auth import require

modules/installed/system/config.py

@@ -1,7 +1,11 @@
 import os, subprocess
 from socket import gethostname
 import cherrypy
-import simplejson as json
+import sys
+if sys.version_info >= (2, 6):
+    import json
+else:
+    import simplejson as json
 from gettext import gettext as _
 from filedict import FileDict
 from modules.auth import require

modules/installed/system/expert_mode.py

@@ -1,6 +1,10 @@
 import os
 import cherrypy
-import simplejson as json
+import sys
+if sys.version_info >= (2, 6):
+    import json
+else:
+    import simplejson as json
 from gettext import gettext as _
 from filedict import FileDict
 from modules.auth import require

modules/installed/system/system.py

@@ -1,6 +1,10 @@
 import os
 import cherrypy
-import simplejson as json
+import sys
+if sys.version_info >= (2, 6):
+    import json
+else:
+    import simplejson as json
 from gettext import gettext as _
 from filedict import FileDict
 from auth import require

modules/installed/system/wan.py

@@ -1,6 +1,10 @@
 import os
 import cherrypy
-import simplejson as json
+import sys
+if sys.version_info >= (2, 6):
+    import json
+else:
+    import simplejson as json
 from gettext import gettext as _
 from filedict import FileDict
 from modules.auth import require