Removal of simplejson

Author: McLeopold

manager/ec2-check.py

@@ -13,7 +13,7 @@
     import json
 except ImportError:
     try:
-        import simplejson as json
+        import json
     except ImportError:
         print "Need access to a json module"
         sys.exit(1)

setup/server_setup.py

@@ -19,7 +19,7 @@
 def install_manager_packages():
     """ Install basic system packages required for the manager """
     pkg_list = ["mysql-server", "python-mysqldb", "openssh-server", "make",
-            "git", "cron", "unzip", "python-simplejson"]
+            "git", "cron", "unzip"]
     install_apt_packages(pkg_list)
 
 def install_website_packages():

worker/tournament_manager.py

@@ -9,7 +9,7 @@
 import time
 import zlib
 import urllib
-import simplejson as json
+import json
 import traceback
 from subprocess import Popen, PIPE