`IPython.zmq` --> `IPython.kernel.zmq` throughout docs and examples

docs/source/development/messaging.txt

@@ -827,7 +827,7 b' data_pub messages are constructed via the :func:`IPython.lib.datapub.publish_dat'
 
 .. sourcecode:: python
 
-    from IPython.zmq.datapub import publish_data
+    from IPython.kernel.zmq.datapub import publish_data
     ns = dict(x=my_array)
     publish_data(ns)
 

docs/source/development/parallel_messages.txt

@@ -260,7 +260,7 b' code string, must be able to send arbitrary (pickleable) Python objects. And ide'
 as little data as we can. The `buffers` property of a Message was introduced for this
 purpose.
 
-Utility method :func:`build_apply_message` in :mod:`IPython.zmq.serialize` wraps a
+Utility method :func:`build_apply_message` in :mod:`IPython.kernel.zmq.serialize` wraps a
 function signature and builds a sendable buffer format for minimal data copying (exactly
 zero copies of numpy array data or buffers or large strings).
 

docs/source/development/reorg.txt

@@ -39,7 +39,7 b' Subpackage descriptions'
   Usually, these are short, single file modules.
 
 * :mod:`IPython.frontend`. This package contains the various IPython
-  frontends which communicate with the :mod:`IPython.zmq` kernels (see
+  frontends which communicate with the :mod:`IPython.kernel.zmq` kernels (see
   :ref:`Messaging in IPython <messaging>`). This includes the
   :ref:`ipython notebook <htmlnotebook>`, :ref:`ipython qtconsole
   <qtconsole>`, and :ref:`ipython console <two_process_console>` entry points.
@@ -79,7 +79,7 b' Subpackage descriptions'
   functions and classes that serve a single purpose and that don't
   depend on things in the rest of IPython.
 
-* :mod:`IPython.zmq`. This sub-package contains code related to starting and
-  managing IPython kernels, which :mod:`IPython.frontend` instances can then
+* :mod:`IPython.kernel.zmq`. This sub-package contains code related to starting
+  and managing IPython kernels, which :mod:`IPython.frontend` instances can then
   communicate with (see :ref:`Messaging in IPython <messaging>`).
 

docs/source/install/install.txt

@@ -274,7 +274,7 b' Security in IPython.parallel is provided by SSH tunnels. By default, Linux'
 and OSX clients will use the shell ssh command, but on Windows, we also
 support tunneling with paramiko_.
 
-Dependencies for IPython.zmq
+Dependencies for IPython.kernel.zmq
 ============================
 
 pyzmq
@@ -286,7 +286,7 b' are found in the PyZMQ_ project, which is easy_install-able once you have'
 ZeroMQ installed.  If you are on Python 2.6 or 2.7 on OSX, or 2.7 on Windows,
 pyzmq has eggs that include ZeroMQ itself.
 
-IPython.zmq depends on pyzmq >= 2.1.4.
+IPython.kernel.zmq depends on pyzmq >= 2.1.4.
 
 Dependencies for the IPython QT console
 =======================================
@@ -300,7 +300,7 b' PyZMQ.'
 Qt
 --
 
-Also with 0.11, a new GUI was added using the work in :mod:`IPython.zmq`, which
+Also with 0.11, a new GUI was added using the work in :mod:`IPython.kernel.zmq`, which
 can be launched with ``ipython qtconsole``. The GUI is built on Qt, and works
 with either PyQt, which can be installed from the `PyQt website
 <http://www.riverbankcomputing.co.uk/>`_, or `PySide

docs/source/parallel/parallel_security.txt

@@ -6,10 +6,10 b' Security details of IPython'
 
 .. note::
 
-    This section is not thorough, and IPython.zmq needs a thorough security
+    This section is not thorough, and IPython.kernel.zmq needs a thorough security
     audit.
 
-IPython's :mod:`IPython.zmq` package exposes the full power of the
+IPython's :mod:`IPython.kernel.zmq` package exposes the full power of the
 Python interpreter over a TCP/IP network for the purposes of parallel
 computing. This feature brings up the important question of IPython's security
 model. This document gives details about this model and how it is implemented

examples/lib/internal_ipkernel.py

@@ -6,7 +6,7 b' import subprocess'
 import sys
 
 from IPython.lib.kernel import connect_qtconsole
-from IPython.zmq.ipkernel import IPKernelApp
+from IPython.kernel.zmq.ipkernel import IPKernelApp
 
 #-----------------------------------------------------------------------------
 # Functions and classes

examples/notebooks/Animations Using clear_output.ipynb

@@ -155,7 +155,7 b''
        "stream": "stdout",
        "text": [
         "\n",
-        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n",
+        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n",
         "For more information, type 'help(pylab)'.\n"
        ]
       }

examples/notebooks/Cell Magics.ipynb

@@ -77,7 +77,7 b''
        "stream": "stdout",
        "text": [
         "\n",
-        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n",
+        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n",
         "For more information, type 'help(pylab)'.\n"
        ]
       }

examples/notebooks/Custom Display Logic.ipynb

@@ -65,7 +65,7 b''
        "stream": "stdout",
        "text": [
         "\n",
-        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n",
+        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n",
         "For more information, type 'help(pylab)'.\n"
        ]
       }

examples/notebooks/Data Publication API.ipynb

@@ -51,7 +51,7 b''
        "stream": "stdout",
        "text": [
         "\n",
-        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n",
+        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n",
         "For more information, type 'help(pylab)'.\n"
        ]
       }
@@ -102,7 +102,7 b''
      "collapsed": false,
      "input": [
       "def publish_it():\n",
-      "    from IPython.zmq.datapub import publish_data\n",
+      "    from IPython.kernel.zmq.datapub import publish_data\n",
       "    publish_data(dict(a='hi'))"
      ],
      "language": "python",
@@ -181,7 +181,7 b''
      "collapsed": false,
      "input": [
       "def simulation_loop():\n",
-      "    from IPython.zmq.datapub import publish_data\n",
+      "    from IPython.kernel.zmq.datapub import publish_data\n",
       "    import time\n",
       "    import numpy as np\n",
       "    for i in range(10):\n",

examples/notebooks/Part 1 - Running Code.ipynb

@@ -371,7 +371,7 b''
        "stream": "stdout",
        "text": [
         "\n",
-        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n",
+        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n",
         "For more information, type 'help(pylab)'.\n"
        ]
       }

examples/notebooks/Part 2 - Basic Output.ipynb

@@ -1023,7 +1023,7 b''
        "stream": "stdout",
        "text": [
         "\n",
-        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n",
+        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n",
         "For more information, type 'help(pylab)'.\n"
        ]
       }

examples/notebooks/Part 3 - Pylab and Matplotlib.ipynb

@@ -56,7 +56,7 b''
        "stream": "stdout",
        "text": [
         "\n",
-        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n",
+        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n",
         "For more information, type 'help(pylab)'.\n"
        ]
       }

examples/notebooks/SymPy Examples.ipynb

@@ -42,7 +42,7 b''
        "stream": "stdout",
        "text": [
         "\n",
-        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n",
+        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n",
         "For more information, type 'help(pylab)'."
        ]
       }

examples/notebooks/Trapezoid Rule.ipynb

@@ -42,7 +42,7 b''
        "stream": "stdout",
        "text": [
         "\n",
-        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n",
+        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n",
         "For more information, type 'help(pylab)'.\n"
        ]
       }

examples/parallel/iopubwatcher.py

@@ -19,7 +19,7 b' import sys'
 import json
 import zmq
 
-from IPython.zmq.session import Session
+from IPython.kernel.zmq.session import Session
 from IPython.parallel.util import disambiguate_url
 from IPython.utils.py3compat import str_to_bytes
 from IPython.utils.path import get_security_file

examples/parallel/options/Parallel MC Options.ipynb

@@ -44,7 +44,7 b''
        "stream": "stdout",
        "text": [
         "\n",
-        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n",
+        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n",
         "For more information, type 'help(pylab)'.\n"
        ]
       }

examples/tests/pylab-switch/Pylab Switching.ipynb

@@ -53,7 +53,7 b''
        "stream": "stdout",
        "text": [
         "\n",
-        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n",
+        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n",
         "For more information, type 'help(pylab)'.\n"
        ]
       },

examples/vim/README.rst

@@ -66,7 +66,7 b' same as passing just the ``--existing`` flag to ``ipython qtconsole`` and'
     kernel - just watch for the connection string that gets printed when you
     open the notebook, or use the ``%connect_info`` magic to get the
     connection string.  If you are still using 0.11, you can launch a regular
-    kernel using ``python -c "from IPython.zmq.ipkernel import main; main()"``
+    kernel using ``python -c "from IPython.kernel.zmq.ipkernel import main; main()"``
 
 ------------------------
 Sending lines to IPython
@@ -176,7 +176,7 b' Current issues:'
     stty stop undef # to unmap ctrl-s
 
 - In vim, if you're getting ``ImportError: No module named
-  IPython.zmq.blockingkernelmanager`` but are able to import it in regular
+  IPython.kernel.zmq.blockingkernelmanager`` but are able to import it in regular
   python, **either**
 
   1. your ``sys.path`` in vim differs from the ``sys.path`` in regular python.

examples/vim/ipy.vim

@@ -83,9 +83,9 b" def km_from_string(s=''):"
     or just 'kernel-12345.json' for IPython 0.12
     """
     from os.path import join as pjoin
-    from IPython.zmq.blockingkernelmanager import BlockingKernelManager, Empty
+    from IPython.kernel.zmq.blockingkernelmanager import BlockingKernelManager, Empty
     from IPython.config.loader import KeyValueConfigLoader
-    from IPython.zmq.kernelapp import kernel_aliases
+    from IPython.kernel.zmq.kernelapp import kernel_aliases
     global km,send,Empty
 
     s = s.replace('--existing', '')