json/jsonapi cleanup

* never use zmq.utils.jsonapi when talking to files
* catch decimal.Decimal returned by jsonlib in the parallel scheduler
* remove IPython.zmq.jsonapi shim

IPython/parallel/apps/ipcontrollerapp.py

@@ -23,6 +23,7 b' Authors:'
 
 from __future__ import with_statement
 
+import json
 import os
 import socket
 import stat
@@ -34,11 +35,6 b' import zmq'
 from zmq.devices import ProcessMonitoredQueue
 from zmq.log.handlers import PUBHandler
 
-# Note: use our own import to work around jsonlib api mismatch.  When these
-# changes propagate to zmq, revert back to the following line instead:
-#from zmq.utils import jsonapi as json
-from IPython.zmq import jsonapi as json
-
 from IPython.core.profiledir import ProfileDir
 
 from IPython.parallel.apps.baseapp import (
@@ -214,7 +210,7 b' class IPControllerApp(BaseParallelApplication):'
                     location = '127.0.0.1'
             cdict['location'] = location
         fname = os.path.join(self.profile_dir.security_dir, fname)
-        with open(fname, 'wb') as f:
+        with open(fname, 'w') as f:
             f.write(json.dumps(cdict, indent=2))
         os.chmod(fname, stat.S_IRUSR|stat.S_IWUSR)
     

IPython/parallel/controller/scheduler.py

@@ -359,7 +359,9 b' class TaskScheduler(SessionFactory):'
         # turn timeouts into datetime objects:
         timeout = header.get('timeout', None)
         if timeout:
-            timeout = datetime.now() + timedelta(0,timeout,0)
+            # cast to float, because jsonlib returns floats as decimal.Decimal,
+            # which timedelta does not accept
+            timeout = datetime.now() + timedelta(0,float(timeout),0)
 
         args = [raw_msg, targets, after, follow, timeout]
 

IPython/zmq/entry_point.py

@@ -4,6 +4,7 b' launchers.'
 
 # Standard library imports.
 import atexit
+import json
 import os
 import socket
 from subprocess import Popen, PIPE
@@ -12,11 +13,6 b' import tempfile'
 
 # System library imports
 
-# Note: use our own import to work around jsonlib api mismatch.  When these
-# changes propagate to zmq, revert back to the following line instead:
-#from zmq.utils import jsonapi as json
-from IPython.zmq import jsonapi as json
-
 # IPython imports
 from IPython.utils.localinterfaces import LOCALHOST
 from IPython.utils.py3compat import bytes_to_str
@@ -86,7 +82,7 b' def write_connection_file(fname=None, shell_port=0, iopub_port=0, stdin_port=0, '
     cfg['ip'] = ip
     cfg['key'] = bytes_to_str(key)
     
-    with open(fname, 'wb') as f:
+    with open(fname, 'w') as f:
         f.write(json.dumps(cfg, indent=2))
     
     return fname, cfg