Commits

Jason R. Coombs  committed 0d88414 Draft

Use json from stdlib. Any performance improvements in simplejson will not be particularly relevant here.

  • Participants
  • Parent commits f23d7f6
  • Branches default

Comments (0)

Files changed (3)

File eggmonster/client/_em_emi.py

 import socket
 import threading
 import signal
+import json
 
 try:
     import fcntl
 except ImportError:
     pass
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
-
 from eggmonster import packages
 from eggmonster import emenv
 

File eggmonster/control/_common.py

 import signal
 import urllib
 import urllib2
-
-try:
-    import json
-except ImportError:
-    import simplejson as json
+import json
 
 from eggmonster import emenv, __version__
 

File eggmonster/server.py

 import traceback
 import optparse
 import functools
+import json
 from datetime import datetime
 
-try:
-    import json  # py2.6 or later
-except ImportError:
-    import simplejson as json
-
 from eventful.proto.http import RESTServer
 from eventful import log, MessageProtocol, call_every
 import eventful