move check_for_zmq to utils.zmqrelated

IPython/utils/zmqrelated.py

@@ -0,0 +1,47 b''
+"""utilities for checking zmq versions"""
+#-----------------------------------------------------------------------------
+#  Copyright (C) 2013  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING.txt, distributed as part of this software.
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# Verify zmq version dependency >= 2.1.11
+#-----------------------------------------------------------------------------
+
+import warnings
+from IPython.utils.version import check_version
+
+
+def patch_pyzmq():
+    """backport a few patches from newer pyzmq
+    
+    These can be removed as we bump our minimum pyzmq version
+    """
+    
+    import zmq
+    
+    # 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, required_by='Someone'):
+    try:
+        import zmq
+    except ImportError:
+        raise ImportError("%s requires pyzmq >= %s"%(required_by, minimum_version))
+    
+    patch_pyzmq()
+    
+    pyzmq_version = zmq.__version__
+    
+    if not check_version(pyzmq_version, minimum_version):
+        raise ImportError("%s requires pyzmq >= %s, but you have %s"%(
+                        required_by, minimum_version, pyzmq_version))
+

IPython/frontend/html/notebook/notebookapp.py

@@ -33,8 +33,8 b' import webbrowser'
 
 
 # Third party
-# check for pyzmq 2.1.11 (this is actually redundant)
-from IPython.kernel.zmq import check_for_zmq
+# check for pyzmq 2.1.11
+from IPython.utils.zmqrelated import check_for_zmq
 check_for_zmq('2.1.11', 'IPython.frontend.html.notebook')
 
 import zmq

IPython/kernel/zmq/__init__.py

@@ -1,5 +1,5 b''
 #-----------------------------------------------------------------------------
-#  Copyright (C) 2010  The IPython Development Team
+#  Copyright (C) 2013  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING.txt, distributed as part of this software.
@@ -9,41 +9,9 b''
 # Verify zmq version dependency >= 2.1.11
 #-----------------------------------------------------------------------------
 
-import warnings
-from IPython.utils.version import check_version
+from IPython.utils.zmqrelated import check_for_zmq
 
-
-def patch_pyzmq():
-    """backport a few patches from newer pyzmq
-    
-    These can be removed as we bump our minimum pyzmq version
-    """
-    
-    import zmq
-    
-    # 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.kernel.zmq'):
-    try:
-        import zmq
-    except ImportError:
-        raise ImportError("%s requires pyzmq >= %s"%(module, minimum_version))
-
-    pyzmq_version = zmq.__version__
-    
-    if not check_version(pyzmq_version, minimum_version):
-        raise ImportError("%s requires pyzmq >= %s, but you have %s"%(
-                        module, minimum_version, pyzmq_version))
-
-check_for_zmq('2.1.11')
-patch_pyzmq()
+check_for_zmq('2.1.11', 'IPython.kernel.zmq')
 
 from .session import Session
 

IPython/parallel/__init__.py

@@ -21,7 +21,7 b' import warnings'
 import zmq
 
 from IPython.config.configurable import MultipleInstanceError
-from IPython.kernel.zmq import check_for_zmq
+from IPython.utils.zmqrelated import check_for_zmq
 
 min_pyzmq = '2.1.11'