Show More
@@ -5,7 +5,7 b" push Python objects into the kernel's namespace, and execute code in the" | |||||
5 | kernel, both directly and via the frontend widget. |
|
5 | kernel, both directly and via the frontend widget. | |
6 | """ |
|
6 | """ | |
7 |
|
7 | |||
8 | from IPython.inprocess.ipkernel import InProcessKernel |
|
8 | from IPython.kernel.inprocess.ipkernel import InProcessKernel | |
9 | from IPython.frontend.qt.console.rich_ipython_widget import RichIPythonWidget |
|
9 | from IPython.frontend.qt.console.rich_ipython_widget import RichIPythonWidget | |
10 | from IPython.frontend.qt.inprocess_kernelmanager import QtInProcessKernelManager |
|
10 | from IPython.frontend.qt.inprocess_kernelmanager import QtInProcessKernelManager | |
11 | from IPython.lib import guisupport |
|
11 | from IPython.lib import guisupport |
@@ -827,7 +827,7 b' data_pub messages are constructed via the :func:`IPython.lib.datapub.publish_dat' | |||||
827 |
|
827 | |||
828 | .. sourcecode:: python |
|
828 | .. sourcecode:: python | |
829 |
|
829 | |||
830 | from IPython.zmq.datapub import publish_data |
|
830 | from IPython.kernel.zmq.datapub import publish_data | |
831 | ns = dict(x=my_array) |
|
831 | ns = dict(x=my_array) | |
832 | publish_data(ns) |
|
832 | publish_data(ns) | |
833 |
|
833 |
@@ -260,7 +260,7 b' code string, must be able to send arbitrary (pickleable) Python objects. And ide' | |||||
260 | as little data as we can. The `buffers` property of a Message was introduced for this |
|
260 | as little data as we can. The `buffers` property of a Message was introduced for this | |
261 | purpose. |
|
261 | purpose. | |
262 |
|
262 | |||
263 | Utility method :func:`build_apply_message` in :mod:`IPython.zmq.serialize` wraps a |
|
263 | Utility method :func:`build_apply_message` in :mod:`IPython.kernel.zmq.serialize` wraps a | |
264 | function signature and builds a sendable buffer format for minimal data copying (exactly |
|
264 | function signature and builds a sendable buffer format for minimal data copying (exactly | |
265 | zero copies of numpy array data or buffers or large strings). |
|
265 | zero copies of numpy array data or buffers or large strings). | |
266 |
|
266 |
@@ -39,7 +39,7 b' Subpackage descriptions' | |||||
39 | Usually, these are short, single file modules. |
|
39 | Usually, these are short, single file modules. | |
40 |
|
40 | |||
41 | * :mod:`IPython.frontend`. This package contains the various IPython |
|
41 | * :mod:`IPython.frontend`. This package contains the various IPython | |
42 | frontends which communicate with the :mod:`IPython.zmq` kernels (see |
|
42 | frontends which communicate with the :mod:`IPython.kernel.zmq` kernels (see | |
43 | :ref:`Messaging in IPython <messaging>`). This includes the |
|
43 | :ref:`Messaging in IPython <messaging>`). This includes the | |
44 | :ref:`ipython notebook <htmlnotebook>`, :ref:`ipython qtconsole |
|
44 | :ref:`ipython notebook <htmlnotebook>`, :ref:`ipython qtconsole | |
45 | <qtconsole>`, and :ref:`ipython console <two_process_console>` entry points. |
|
45 | <qtconsole>`, and :ref:`ipython console <two_process_console>` entry points. | |
@@ -79,7 +79,7 b' Subpackage descriptions' | |||||
79 | functions and classes that serve a single purpose and that don't |
|
79 | functions and classes that serve a single purpose and that don't | |
80 | depend on things in the rest of IPython. |
|
80 | depend on things in the rest of IPython. | |
81 |
|
81 | |||
82 |
* :mod:`IPython.zmq`. This sub-package contains code related to starting |
|
82 | * :mod:`IPython.kernel.zmq`. This sub-package contains code related to starting | |
83 | managing IPython kernels, which :mod:`IPython.frontend` instances can then |
|
83 | and managing IPython kernels, which :mod:`IPython.frontend` instances can then | |
84 | communicate with (see :ref:`Messaging in IPython <messaging>`). |
|
84 | communicate with (see :ref:`Messaging in IPython <messaging>`). | |
85 |
|
85 |
@@ -274,7 +274,7 b' Security in IPython.parallel is provided by SSH tunnels. By default, Linux' | |||||
274 | and OSX clients will use the shell ssh command, but on Windows, we also |
|
274 | and OSX clients will use the shell ssh command, but on Windows, we also | |
275 | support tunneling with paramiko_. |
|
275 | support tunneling with paramiko_. | |
276 |
|
276 | |||
277 | Dependencies for IPython.zmq |
|
277 | Dependencies for IPython.kernel.zmq | |
278 | ============================ |
|
278 | ============================ | |
279 |
|
279 | |||
280 | pyzmq |
|
280 | pyzmq | |
@@ -286,7 +286,7 b' are found in the PyZMQ_ project, which is easy_install-able once you have' | |||||
286 | ZeroMQ installed. If you are on Python 2.6 or 2.7 on OSX, or 2.7 on Windows, |
|
286 | ZeroMQ installed. If you are on Python 2.6 or 2.7 on OSX, or 2.7 on Windows, | |
287 | pyzmq has eggs that include ZeroMQ itself. |
|
287 | pyzmq has eggs that include ZeroMQ itself. | |
288 |
|
288 | |||
289 | IPython.zmq depends on pyzmq >= 2.1.4. |
|
289 | IPython.kernel.zmq depends on pyzmq >= 2.1.4. | |
290 |
|
290 | |||
291 | Dependencies for the IPython QT console |
|
291 | Dependencies for the IPython QT console | |
292 | ======================================= |
|
292 | ======================================= | |
@@ -300,7 +300,7 b' PyZMQ.' | |||||
300 | Qt |
|
300 | Qt | |
301 | -- |
|
301 | -- | |
302 |
|
302 | |||
303 | Also with 0.11, a new GUI was added using the work in :mod:`IPython.zmq`, which |
|
303 | Also with 0.11, a new GUI was added using the work in :mod:`IPython.kernel.zmq`, which | |
304 | can be launched with ``ipython qtconsole``. The GUI is built on Qt, and works |
|
304 | can be launched with ``ipython qtconsole``. The GUI is built on Qt, and works | |
305 | with either PyQt, which can be installed from the `PyQt website |
|
305 | with either PyQt, which can be installed from the `PyQt website | |
306 | <http://www.riverbankcomputing.co.uk/>`_, or `PySide |
|
306 | <http://www.riverbankcomputing.co.uk/>`_, or `PySide |
@@ -6,10 +6,10 b' Security details of IPython' | |||||
6 |
|
6 | |||
7 | .. note:: |
|
7 | .. note:: | |
8 |
|
8 | |||
9 | This section is not thorough, and IPython.zmq needs a thorough security |
|
9 | This section is not thorough, and IPython.kernel.zmq needs a thorough security | |
10 | audit. |
|
10 | audit. | |
11 |
|
11 | |||
12 | IPython's :mod:`IPython.zmq` package exposes the full power of the |
|
12 | IPython's :mod:`IPython.kernel.zmq` package exposes the full power of the | |
13 | Python interpreter over a TCP/IP network for the purposes of parallel |
|
13 | Python interpreter over a TCP/IP network for the purposes of parallel | |
14 | computing. This feature brings up the important question of IPython's security |
|
14 | computing. This feature brings up the important question of IPython's security | |
15 | model. This document gives details about this model and how it is implemented |
|
15 | model. This document gives details about this model and how it is implemented |
@@ -6,7 +6,7 b' import subprocess' | |||||
6 | import sys |
|
6 | import sys | |
7 |
|
7 | |||
8 | from IPython.lib.kernel import connect_qtconsole |
|
8 | from IPython.lib.kernel import connect_qtconsole | |
9 | from IPython.zmq.ipkernel import IPKernelApp |
|
9 | from IPython.kernel.zmq.ipkernel import IPKernelApp | |
10 |
|
10 | |||
11 | #----------------------------------------------------------------------------- |
|
11 | #----------------------------------------------------------------------------- | |
12 | # Functions and classes |
|
12 | # Functions and classes |
@@ -155,7 +155,7 b'' | |||||
155 | "stream": "stdout", |
|
155 | "stream": "stdout", | |
156 | "text": [ |
|
156 | "text": [ | |
157 | "\n", |
|
157 | "\n", | |
158 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n", |
|
158 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n", | |
159 | "For more information, type 'help(pylab)'.\n" |
|
159 | "For more information, type 'help(pylab)'.\n" | |
160 | ] |
|
160 | ] | |
161 | } |
|
161 | } |
@@ -77,7 +77,7 b'' | |||||
77 | "stream": "stdout", |
|
77 | "stream": "stdout", | |
78 | "text": [ |
|
78 | "text": [ | |
79 | "\n", |
|
79 | "\n", | |
80 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n", |
|
80 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n", | |
81 | "For more information, type 'help(pylab)'.\n" |
|
81 | "For more information, type 'help(pylab)'.\n" | |
82 | ] |
|
82 | ] | |
83 | } |
|
83 | } |
@@ -65,7 +65,7 b'' | |||||
65 | "stream": "stdout", |
|
65 | "stream": "stdout", | |
66 | "text": [ |
|
66 | "text": [ | |
67 | "\n", |
|
67 | "\n", | |
68 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n", |
|
68 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n", | |
69 | "For more information, type 'help(pylab)'.\n" |
|
69 | "For more information, type 'help(pylab)'.\n" | |
70 | ] |
|
70 | ] | |
71 | } |
|
71 | } |
@@ -51,7 +51,7 b'' | |||||
51 | "stream": "stdout", |
|
51 | "stream": "stdout", | |
52 | "text": [ |
|
52 | "text": [ | |
53 | "\n", |
|
53 | "\n", | |
54 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n", |
|
54 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n", | |
55 | "For more information, type 'help(pylab)'.\n" |
|
55 | "For more information, type 'help(pylab)'.\n" | |
56 | ] |
|
56 | ] | |
57 | } |
|
57 | } | |
@@ -102,7 +102,7 b'' | |||||
102 | "collapsed": false, |
|
102 | "collapsed": false, | |
103 | "input": [ |
|
103 | "input": [ | |
104 | "def publish_it():\n", |
|
104 | "def publish_it():\n", | |
105 | " from IPython.zmq.datapub import publish_data\n", |
|
105 | " from IPython.kernel.zmq.datapub import publish_data\n", | |
106 | " publish_data(dict(a='hi'))" |
|
106 | " publish_data(dict(a='hi'))" | |
107 | ], |
|
107 | ], | |
108 | "language": "python", |
|
108 | "language": "python", | |
@@ -181,7 +181,7 b'' | |||||
181 | "collapsed": false, |
|
181 | "collapsed": false, | |
182 | "input": [ |
|
182 | "input": [ | |
183 | "def simulation_loop():\n", |
|
183 | "def simulation_loop():\n", | |
184 | " from IPython.zmq.datapub import publish_data\n", |
|
184 | " from IPython.kernel.zmq.datapub import publish_data\n", | |
185 | " import time\n", |
|
185 | " import time\n", | |
186 | " import numpy as np\n", |
|
186 | " import numpy as np\n", | |
187 | " for i in range(10):\n", |
|
187 | " for i in range(10):\n", |
@@ -371,7 +371,7 b'' | |||||
371 | "stream": "stdout", |
|
371 | "stream": "stdout", | |
372 | "text": [ |
|
372 | "text": [ | |
373 | "\n", |
|
373 | "\n", | |
374 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n", |
|
374 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n", | |
375 | "For more information, type 'help(pylab)'.\n" |
|
375 | "For more information, type 'help(pylab)'.\n" | |
376 | ] |
|
376 | ] | |
377 | } |
|
377 | } |
@@ -1023,7 +1023,7 b'' | |||||
1023 | "stream": "stdout", |
|
1023 | "stream": "stdout", | |
1024 | "text": [ |
|
1024 | "text": [ | |
1025 | "\n", |
|
1025 | "\n", | |
1026 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n", |
|
1026 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n", | |
1027 | "For more information, type 'help(pylab)'.\n" |
|
1027 | "For more information, type 'help(pylab)'.\n" | |
1028 | ] |
|
1028 | ] | |
1029 | } |
|
1029 | } |
@@ -56,7 +56,7 b'' | |||||
56 | "stream": "stdout", |
|
56 | "stream": "stdout", | |
57 | "text": [ |
|
57 | "text": [ | |
58 | "\n", |
|
58 | "\n", | |
59 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n", |
|
59 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n", | |
60 | "For more information, type 'help(pylab)'.\n" |
|
60 | "For more information, type 'help(pylab)'.\n" | |
61 | ] |
|
61 | ] | |
62 | } |
|
62 | } |
@@ -42,7 +42,7 b'' | |||||
42 | "stream": "stdout", |
|
42 | "stream": "stdout", | |
43 | "text": [ |
|
43 | "text": [ | |
44 | "\n", |
|
44 | "\n", | |
45 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n", |
|
45 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n", | |
46 | "For more information, type 'help(pylab)'." |
|
46 | "For more information, type 'help(pylab)'." | |
47 | ] |
|
47 | ] | |
48 | } |
|
48 | } |
@@ -42,7 +42,7 b'' | |||||
42 | "stream": "stdout", |
|
42 | "stream": "stdout", | |
43 | "text": [ |
|
43 | "text": [ | |
44 | "\n", |
|
44 | "\n", | |
45 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n", |
|
45 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n", | |
46 | "For more information, type 'help(pylab)'.\n" |
|
46 | "For more information, type 'help(pylab)'.\n" | |
47 | ] |
|
47 | ] | |
48 | } |
|
48 | } |
@@ -19,7 +19,7 b' import sys' | |||||
19 | import json |
|
19 | import json | |
20 | import zmq |
|
20 | import zmq | |
21 |
|
21 | |||
22 | from IPython.zmq.session import Session |
|
22 | from IPython.kernel.zmq.session import Session | |
23 | from IPython.parallel.util import disambiguate_url |
|
23 | from IPython.parallel.util import disambiguate_url | |
24 | from IPython.utils.py3compat import str_to_bytes |
|
24 | from IPython.utils.py3compat import str_to_bytes | |
25 | from IPython.utils.path import get_security_file |
|
25 | from IPython.utils.path import get_security_file |
@@ -44,7 +44,7 b'' | |||||
44 | "stream": "stdout", |
|
44 | "stream": "stdout", | |
45 | "text": [ |
|
45 | "text": [ | |
46 | "\n", |
|
46 | "\n", | |
47 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n", |
|
47 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n", | |
48 | "For more information, type 'help(pylab)'.\n" |
|
48 | "For more information, type 'help(pylab)'.\n" | |
49 | ] |
|
49 | ] | |
50 | } |
|
50 | } |
@@ -53,7 +53,7 b'' | |||||
53 | "stream": "stdout", |
|
53 | "stream": "stdout", | |
54 | "text": [ |
|
54 | "text": [ | |
55 | "\n", |
|
55 | "\n", | |
56 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].\n", |
|
56 | "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n", | |
57 | "For more information, type 'help(pylab)'.\n" |
|
57 | "For more information, type 'help(pylab)'.\n" | |
58 | ] |
|
58 | ] | |
59 | }, |
|
59 | }, |
@@ -66,7 +66,7 b' same as passing just the ``--existing`` flag to ``ipython qtconsole`` and' | |||||
66 | kernel - just watch for the connection string that gets printed when you |
|
66 | kernel - just watch for the connection string that gets printed when you | |
67 | open the notebook, or use the ``%connect_info`` magic to get the |
|
67 | open the notebook, or use the ``%connect_info`` magic to get the | |
68 | connection string. If you are still using 0.11, you can launch a regular |
|
68 | connection string. If you are still using 0.11, you can launch a regular | |
69 | kernel using ``python -c "from IPython.zmq.ipkernel import main; main()"`` |
|
69 | kernel using ``python -c "from IPython.kernel.zmq.ipkernel import main; main()"`` | |
70 |
|
70 | |||
71 | ------------------------ |
|
71 | ------------------------ | |
72 | Sending lines to IPython |
|
72 | Sending lines to IPython | |
@@ -176,7 +176,7 b' Current issues:' | |||||
176 | stty stop undef # to unmap ctrl-s |
|
176 | stty stop undef # to unmap ctrl-s | |
177 |
|
177 | |||
178 | - In vim, if you're getting ``ImportError: No module named |
|
178 | - In vim, if you're getting ``ImportError: No module named | |
179 | IPython.zmq.blockingkernelmanager`` but are able to import it in regular |
|
179 | IPython.kernel.zmq.blockingkernelmanager`` but are able to import it in regular | |
180 | python, **either** |
|
180 | python, **either** | |
181 |
|
181 | |||
182 | 1. your ``sys.path`` in vim differs from the ``sys.path`` in regular python. |
|
182 | 1. your ``sys.path`` in vim differs from the ``sys.path`` in regular python. |
@@ -83,9 +83,9 b" def km_from_string(s=''):" | |||||
83 | or just 'kernel-12345.json' for IPython 0.12 |
|
83 | or just 'kernel-12345.json' for IPython 0.12 | |
84 | """ |
|
84 | """ | |
85 | from os.path import join as pjoin |
|
85 | from os.path import join as pjoin | |
86 | from IPython.zmq.blockingkernelmanager import BlockingKernelManager, Empty |
|
86 | from IPython.kernel.zmq.blockingkernelmanager import BlockingKernelManager, Empty | |
87 | from IPython.config.loader import KeyValueConfigLoader |
|
87 | from IPython.config.loader import KeyValueConfigLoader | |
88 | from IPython.zmq.kernelapp import kernel_aliases |
|
88 | from IPython.kernel.zmq.kernelapp import kernel_aliases | |
89 | global km,send,Empty |
|
89 | global km,send,Empty | |
90 |
|
90 | |||
91 | s = s.replace('--existing', '') |
|
91 | s = s.replace('--existing', '') |
General Comments 0
You need to be logged in to leave comments.
Login now