Merge pull request #1652 from minrk/zmqcompat

add patch_pyzmq() for backporting a few changes from newer pyzmq

* fixes missing constants in super-old pyzmq
* define ioloop.install if not defined
* never allow jsonlib to be used by zmq.utils.jsonapi (#1520).

Closes  #1520.

IPython/frontend/html/notebook/__init__.py

@@ -13,3 +13,8 b' except AttributeError:'
 if version_info < (2,1,0):
     raise ImportError(msg + ", but you have %s" % tornado.version)
 del msg
+
+# check for pyzmq 2.1.4
+from IPython.zmq import check_for_zmq
+check_for_zmq('2.1.4', 'IPython.frontend.html.notebook')
+del check_for_zmq

IPython/frontend/html/notebook/notebookapp.py

@@ -35,13 +35,7 b' import zmq'
 # Install the pyzmq ioloop. This has to be done before anything else from
 # tornado is imported.
 from zmq.eventloop import ioloop
-# FIXME: ioloop.install is new in pyzmq-2.1.7, so remove this conditional
-# when pyzmq dependency is updated beyond that.
-if hasattr(ioloop, 'install'):
     ioloop.install()
-else:
-    import tornado.ioloop
-    tornado.ioloop.IOLoop = ioloop.IOLoop
 
 from tornado import httpserver
 from tornado import web

IPython/zmq/__init__.py

@@ -12,6 +12,40 b''
 import warnings
 from distutils.version import LooseVersion as V
 
+
+def patch_pyzmq():
+    """backport a few patches from newer pyzmq
+    
+    These can be removed as we bump our minimum pyzmq version
+    """
+    
+    import zmq
+    
+    # ioloop.install, introduced in pyzmq 2.1.7
+    from zmq.eventloop import ioloop
+    
+    def install():
+        import tornado.ioloop
+        tornado.ioloop.IOLoop = ioloop.IOLoop
+    
+    if not hasattr(ioloop, 'install'):
+        ioloop.install = install
+    
+    # fix missing DEALER/ROUTER aliases in pyzmq < 2.1.9
+    if not hasattr(zmq, 'DEALER'):
+        zmq.DEALER = zmq.XREQ
+    if not hasattr(zmq, 'ROUTER'):
+        zmq.ROUTER = zmq.XREP
+    
+    # fallback on stdlib json if jsonlib is selected, because jsonlib breaks things.
+    # jsonlib support is removed from pyzmq >= 2.2.0
+
+    from zmq.utils import jsonapi
+    if jsonapi.jsonmod.__name__ == 'jsonlib':
+        import json
+        jsonapi.jsonmod = json
+
+
 def check_for_zmq(minimum_version, module='IPython.zmq'):
     try:
         import zmq
@@ -24,12 +58,6 b" def check_for_zmq(minimum_version, module='IPython.zmq'):"
         raise ImportError("%s requires pyzmq >= %s, but you have %s"%(
                         module, minimum_version, pyzmq_version))
 
-    # fix missing DEALER/ROUTER aliases in pyzmq < 2.1.9
-    if not hasattr(zmq, 'DEALER'):
-        zmq.DEALER = zmq.XREQ
-    if not hasattr(zmq, 'ROUTER'):
-        zmq.ROUTER = zmq.XREP
-
     if V(zmq.zmq_version()) >= V('4.0.0'):
         warnings.warn("""libzmq 4 detected.
         It is unlikely that IPython's zmq code will work properly.
@@ -37,3 +65,4 b" def check_for_zmq(minimum_version, module='IPython.zmq'):"
         RuntimeWarning)
 
 check_for_zmq('2.1.4')
+patch_pyzmq()

IPython/zmq/session.py

@@ -74,21 +74,9 b' def squash_unicode(obj):'
 #-----------------------------------------------------------------------------
 
 
-# jsonlib behaves a bit differently, so handle that where it affects us
-if jsonapi.jsonmod.__name__ == 'jsonlib':
-    # kwarg for serializing unknown types (datetime) is different
-    dumps_kwargs = dict(on_unknown=date_default)
-    # By default, jsonlib unpacks floats as Decimal instead of float,
-    # which can foul things up
-    loads_kwargs = dict(use_float=True)
-else:
     # ISO8601-ify datetime objects
-    dumps_kwargs = dict(default=date_default)
-    # nothing to specify for loads
-    loads_kwargs = dict()
-
-json_packer = lambda obj: jsonapi.dumps(obj, **dumps_kwargs)
-json_unpacker = lambda s: extract_dates(jsonapi.loads(s, **loads_kwargs))
+json_packer = lambda obj: jsonapi.dumps(obj, default=date_default)
+json_unpacker = lambda s: extract_dates(jsonapi.loads(s))
 
 pickle_packer = lambda o: pickle.dumps(o,-1)
 pickle_unpacker = pickle.loads