Show More
@@ -36,7 +36,7 b' from IPython.config.configurable import Configurable' | |||||
36 | from IPython.core.profiledir import ProfileDir |
|
36 | from IPython.core.profiledir import ProfileDir | |
37 | from IPython.zmq.blockingkernelmanager import BlockingKernelManager |
|
37 | from IPython.zmq.blockingkernelmanager import BlockingKernelManager | |
38 | from IPython.zmq.kernelmanager import KernelManager |
|
38 | from IPython.zmq.kernelmanager import KernelManager | |
39 |
from IPython |
|
39 | from IPython.kernel import tunnel_to_kernel, find_connection_file, swallow_argv | |
40 | from IPython.utils.path import filefind |
|
40 | from IPython.utils.path import filefind | |
41 | from IPython.utils.py3compat import str_to_bytes |
|
41 | from IPython.utils.py3compat import str_to_bytes | |
42 | from IPython.utils.traitlets import ( |
|
42 | from IPython.utils.traitlets import ( |
@@ -70,7 +70,7 b' from IPython.zmq.ipkernel import (' | |||||
70 | ) |
|
70 | ) | |
71 | from IPython.utils.importstring import import_item |
|
71 | from IPython.utils.importstring import import_item | |
72 | from IPython.utils.localinterfaces import LOCALHOST |
|
72 | from IPython.utils.localinterfaces import LOCALHOST | |
73 |
from IPython |
|
73 | from IPython.kernel import swallow_argv | |
74 | from IPython.utils.traitlets import ( |
|
74 | from IPython.utils.traitlets import ( | |
75 | Dict, Unicode, Integer, List, Enum, Bool, |
|
75 | Dict, Unicode, Integer, List, Enum, Bool, | |
76 | DottedObjectName |
|
76 | DottedObjectName |
@@ -65,7 +65,7 b' from IPython.frontend.qt.console.rich_ipython_widget import RichIPythonWidget' | |||||
65 | from IPython.frontend.qt.console import styles |
|
65 | from IPython.frontend.qt.console import styles | |
66 | from IPython.frontend.qt.console.mainwindow import MainWindow |
|
66 | from IPython.frontend.qt.console.mainwindow import MainWindow | |
67 | from IPython.frontend.qt.kernelmanager import QtKernelManager |
|
67 | from IPython.frontend.qt.kernelmanager import QtKernelManager | |
68 |
from IPython |
|
68 | from IPython.kernel import tunnel_to_kernel, find_connection_file | |
69 | from IPython.utils.path import filefind |
|
69 | from IPython.utils.path import filefind | |
70 | from IPython.utils.py3compat import str_to_bytes |
|
70 | from IPython.utils.py3compat import str_to_bytes | |
71 | from IPython.utils.traitlets import ( |
|
71 | from IPython.utils.traitlets import ( |
@@ -1,10 +1,3 b'' | |||||
1 | """IPython.kernel has been replaced by IPython.parallel. |
|
1 | """IPython kernel bases""" | |
2 |
|
2 | |||
3 | The previous version of IPython's parallel library was located at this |
|
3 | from .util import * | |
4 | location (IPython.kernel). It has been moved to the IPython.parallel |
|
|||
5 | subpackage and has been refactored to use zeromq/pyzmq instead of twisted. |
|
|||
6 |
|
||||
7 | Please see INSERT URL for further details. |
|
|||
8 | """ |
|
|||
9 |
|
||||
10 | raise ImportError(__doc__) |
|
1 | NO CONTENT: file renamed from IPython/utils/tests/test_kernel.py to IPython/kernel/tests/test_util.py |
|
NO CONTENT: file renamed from IPython/utils/tests/test_kernel.py to IPython/kernel/tests/test_util.py |
1 | NO CONTENT: file renamed from IPython/utils/kernel.py to IPython/kernel/util.py |
|
NO CONTENT: file renamed from IPython/utils/kernel.py to IPython/kernel/util.py |
@@ -1,12 +1,12 b'' | |||||
1 | """[DEPRECATED] Utilities for connecting to kernels |
|
1 | """[DEPRECATED] Utilities for connecting to kernels | |
2 |
|
2 | |||
3 | Moved to IPython.utils.kernel, where it always belonged. |
|
3 | Moved to IPython.kernel.util | |
4 | """ |
|
4 | """ | |
5 |
|
5 | |||
6 | import warnings |
|
6 | import warnings | |
7 |
warnings.warn("IPython.lib.kernel moved to IPython. |
|
7 | warnings.warn("IPython.lib.kernel moved to IPython.kernel in IPython 0.14", | |
8 | DeprecationWarning |
|
8 | DeprecationWarning | |
9 | ) |
|
9 | ) | |
10 |
|
10 | |||
11 |
from IPython. |
|
11 | from IPython.kernel.util import * | |
12 |
|
12 |
@@ -40,7 +40,7 b' from IPython.utils.traitlets import (' | |||||
40 | DottedObjectName, |
|
40 | DottedObjectName, | |
41 | ) |
|
41 | ) | |
42 | from IPython.utils.importstring import import_item |
|
42 | from IPython.utils.importstring import import_item | |
43 |
from IPython |
|
43 | from IPython.kernel import write_connection_file | |
44 | # local imports |
|
44 | # local imports | |
45 | from IPython.zmq.heartbeat import Heartbeat |
|
45 | from IPython.zmq.heartbeat import Heartbeat | |
46 | from IPython.zmq.parentpoller import ParentPollerUnix, ParentPollerWindows |
|
46 | from IPython.zmq.parentpoller import ParentPollerUnix, ParentPollerWindows |
@@ -40,7 +40,7 b' from IPython.utils.traitlets import (' | |||||
40 | Any, Instance, Type, Unicode, List, Integer, Bool, CaselessStrEnum |
|
40 | Any, Instance, Type, Unicode, List, Integer, Bool, CaselessStrEnum | |
41 | ) |
|
41 | ) | |
42 | from IPython.utils.py3compat import str_to_bytes |
|
42 | from IPython.utils.py3compat import str_to_bytes | |
43 |
from IPython |
|
43 | from IPython.kernel import ( | |
44 | write_connection_file, |
|
44 | write_connection_file, | |
45 | make_ipkernel_cmd, |
|
45 | make_ipkernel_cmd, | |
46 | launch_kernel, |
|
46 | launch_kernel, |
@@ -35,7 +35,7 b' from IPython.core.magics import MacroToEdit, CodeMagics' | |||||
35 | from IPython.core.magic import magics_class, line_magic, Magics |
|
35 | from IPython.core.magic import magics_class, line_magic, Magics | |
36 | from IPython.core.payloadpage import install_payload_page |
|
36 | from IPython.core.payloadpage import install_payload_page | |
37 | from IPython.inprocess.socket import SocketABC |
|
37 | from IPython.inprocess.socket import SocketABC | |
38 |
from IPython |
|
38 | from IPython.kernel import ( | |
39 | get_connection_file, get_connection_info, connect_qtconsole |
|
39 | get_connection_file, get_connection_info, connect_qtconsole | |
40 | ) |
|
40 | ) | |
41 | from IPython.testing.skipdoctest import skip_doctest |
|
41 | from IPython.testing.skipdoctest import skip_doctest |
General Comments 0
You need to be logged in to leave comments.
Login now