Skip to content

Commit 52c3240

Browse files
minrkminrk
committed
move zmq.KernelManagers into IPython.kernel
1 parent d72b217 commit 52c3240

14 files changed

Lines changed: 25 additions & 25 deletions

‎IPython/frontend/consoleapp.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
from IPython.config.application import boolean_flag
3535
from IPython.config.configurable import Configurable
3636
from IPython.core.profiledir import ProfileDir
37-
from IPython.zmq.blockingkernelmanager import BlockingKernelManager
38-
from IPython.zmq.kernelmanager import KernelManager
37+
from IPython.kernel.blockingkernelmanager import BlockingKernelManager
38+
from IPython.kernel.kernelmanager import KernelManager
3939
from IPython.kernel import tunnel_to_kernel, find_connection_file, swallow_argv
4040
from IPython.utils.path import filefind
4141
from IPython.utils.py3compat import str_to_bytes

‎IPython/frontend/html/notebook/kernelmanager.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class MultiKernelManager(LoggingConfigurable):
4141
"""A class for managing multiple kernels."""
4242

4343
kernel_manager_class = DottedObjectName(
44-
"IPython.zmq.blockingkernelmanager.BlockingKernelManager", config=True,
44+
"IPython.kernel.blockingkernelmanager.BlockingKernelManager", config=True,
4545
help="""The kernel manager class. This is configurable to allow
4646
subclassing of the KernelManager for customized behavior.
4747
"""

‎IPython/frontend/html/notebook/tests/test_kernelmanager.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from IPython.config.loader import Config
1010
from IPython.frontend.html.notebook.kernelmanager import MultiKernelManager
1111
from IPython.utils.localinterfaces import LOCALHOST
12-
from IPython.zmq.kernelmanager import KernelManager
12+
from IPython.kernel.kernelmanager import KernelManager
1313

1414
class TestKernelManager(TestCase):
1515

‎IPython/frontend/qt/kernelmanager.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# Local imports.
55
from IPython.utils.traitlets import Type
6-
from IPython.zmq.kernelmanager import ShellChannel, IOPubChannel, \
6+
from IPython.kernel.kernelmanager import ShellChannel, IOPubChannel, \
77
StdInChannel, HBChannel, KernelManager
88
from base_kernelmanager import QtShellChannelMixin, QtIOPubChannelMixin, \
99
QtStdInChannelMixin, QtHBChannelMixin, QtKernelManagerMixin

‎IPython/frontend/terminal/console/tests/test_image_handler.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import unittest
1111
import base64
1212

13-
from IPython.zmq.kernelmanager import KernelManager
13+
from IPython.kernel.kernelmanager import KernelManager
1414
from IPython.frontend.terminal.console.interactiveshell \
1515
import ZMQTerminalInteractiveShell
1616
from IPython.utils.tempdir import TemporaryDirectory

‎IPython/inprocess/blockingkernelmanager.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from IPython.utils.traitlets import Type
2020
from kernelmanager import InProcessKernelManager, InProcessShellChannel, \
2121
InProcessIOPubChannel, InProcessStdInChannel
22-
from IPython.zmq.blockingkernelmanager import BlockingChannelMixin
22+
from IPython.kernel.blockingkernelmanager import BlockingChannelMixin
2323

2424

2525
#-----------------------------------------------------------------------------

‎IPython/inprocess/kernelmanager.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def process_events(self):
7676

7777

7878
class InProcessShellChannel(InProcessChannel):
79-
"""See `IPython.zmq.kernelmanager.ShellChannel` for docstrings."""
79+
"""See `IPython.kernel.kernelmanager.ShellChannel` for docstrings."""
8080

8181
# flag for whether execute requests should be allowed to call raw_input
8282
allow_stdin = True
@@ -141,14 +141,14 @@ def _dispatch_to_kernel(self, msg):
141141

142142

143143
class InProcessIOPubChannel(InProcessChannel):
144-
"""See `IPython.zmq.kernelmanager.IOPubChannel` for docstrings."""
144+
"""See `IPython.kernel.kernelmanager.IOPubChannel` for docstrings."""
145145

146146
def flush(self, timeout=1.0):
147147
pass
148148

149149

150150
class InProcessStdInChannel(InProcessChannel):
151-
"""See `IPython.zmq.kernelmanager.StdInChannel` for docstrings."""
151+
"""See `IPython.kernel.kernelmanager.StdInChannel` for docstrings."""
152152

153153
def input(self, string):
154154
kernel = self.manager.kernel
@@ -158,7 +158,7 @@ def input(self, string):
158158

159159

160160
class InProcessHBChannel(InProcessChannel):
161-
"""See `IPython.zmq.kernelmanager.HBChannel` for docstrings."""
161+
"""See `IPython.kernel.kernelmanager.HBChannel` for docstrings."""
162162

163163
time_to_dead = 3.0
164164

@@ -187,7 +187,7 @@ class InProcessKernelManager(Configurable):
187187
`IPython.kernel.kernelmanagerabc.KernelManagerABC` and allows
188188
(asynchronous) frontends to be used seamlessly with an in-process kernel.
189189
190-
See `IPython.zmq.kernelmanager.KernelManager` for docstrings.
190+
See `IPython.kernel.kernelmanager.KernelManager` for docstrings.
191191
"""
192192

193193
# The Session to use for building messages.

IPython/zmq/blockingkernelmanager.py renamed to IPython/kernel/blockingkernelmanager.py

File renamed without changes.

IPython/zmq/kernelmanager.py renamed to IPython/kernel/kernelmanager.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# Imports
1616
#-----------------------------------------------------------------------------
1717

18-
# Standard library imports.
18+
# Standard library imports
1919
import atexit
2020
import errno
2121
import json
@@ -26,14 +26,14 @@
2626
from threading import Thread
2727
import time
2828

29-
# System library imports.
29+
# System library imports
3030
import zmq
3131
# import ZMQError in top-level namespace, to avoid ugly attribute-error messages
3232
# during garbage collection of threads at exit:
3333
from zmq import ZMQError
3434
from zmq.eventloop import ioloop, zmqstream
3535

36-
# Local imports.
36+
# Local imports
3737
from IPython.config.configurable import Configurable
3838
from IPython.utils.localinterfaces import LOCALHOST, LOCAL_IPS
3939
from IPython.utils.traitlets import (
@@ -45,7 +45,7 @@
4545
make_ipkernel_cmd,
4646
launch_kernel,
4747
)
48-
from session import Session
48+
from IPython.zmq.session import Session
4949
from IPython.kernel import (
5050
ShellChannelABC, IOPubChannelABC,
5151
HBChannelABC, StdInChannelABC,

‎IPython/kernel/kernelmanagerabc.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ShellChannelABC(ChannelABC):
4242
4343
The docstrings for this class can be found in the base implementation:
4444
45-
`IPython.zmq.kernelmanager.ShellChannel`
45+
`IPython.kernel.kernelmanager.ShellChannel`
4646
"""
4747

4848
@abc.abstractproperty
@@ -80,7 +80,7 @@ class IOPubChannelABC(ChannelABC):
8080
8181
The docstrings for this class can be found in the base implementation:
8282
83-
`IPython.zmq.kernelmanager.IOPubChannel`
83+
`IPython.kernel.kernelmanager.IOPubChannel`
8484
"""
8585

8686
@abc.abstractmethod
@@ -93,7 +93,7 @@ class StdInChannelABC(ChannelABC):
9393
9494
The docstrings for this class can be found in the base implementation:
9595
96-
`IPython.zmq.kernelmanager.StdInChannel`
96+
`IPython.kernel.kernelmanager.StdInChannel`
9797
"""
9898

9999
@abc.abstractmethod
@@ -106,7 +106,7 @@ class HBChannelABC(ChannelABC):
106106
107107
The docstrings for this class can be found in the base implementation:
108108
109-
`IPython.zmq.kernelmanager.HBChannel`
109+
`IPython.kernel.kernelmanager.HBChannel`
110110
"""
111111

112112
@abc.abstractproperty
@@ -135,7 +135,7 @@ class KernelManagerABC(object):
135135
136136
The docstrings for this class can be found in the base implementation:
137137
138-
`IPython.zmq.kernelmanager.KernelManager`
138+
`IPython.kernel.kernelmanager.KernelManager`
139139
"""
140140

141141
__metaclass__ = abc.ABCMeta

0 commit comments

Comments
 (0)