diff --git a/IPython/zmq/ipkernel.py b/IPython/zmq/ipkernel.py index d0ec165..9b8bdc3 100755 --- a/IPython/zmq/ipkernel.py +++ b/IPython/zmq/ipkernel.py @@ -27,6 +27,7 @@ import logging import zmq # Local imports. +from IPython.core import pylabtools from IPython.config.configurable import Configurable from IPython.config.application import boolean_flag, catch_config_error from IPython.core.application import ProfileDir @@ -37,7 +38,6 @@ from IPython.core.shellapp import ( from IPython.utils import io from IPython.utils import py3compat from IPython.utils.jsonutil import json_clean -from IPython.lib import pylabtools from IPython.utils.traitlets import ( Any, Instance, Float, Dict, CaselessStrEnum ) diff --git a/IPython/zmq/zmqshell.py b/IPython/zmq/zmqshell.py index 19641a1..4f5323c 100644 --- a/IPython/zmq/zmqshell.py +++ b/IPython/zmq/zmqshell.py @@ -25,13 +25,12 @@ from subprocess import Popen, PIPE from IPython.core.interactiveshell import ( InteractiveShell, InteractiveShellABC ) -from IPython.core import page +from IPython.core import page, pylabtools from IPython.core.autocall import ZMQExitAutocall from IPython.core.displaypub import DisplayPublisher from IPython.core.macro import Macro from IPython.core.magic import MacroToEdit from IPython.core.payloadpage import install_payload_page -from IPython.lib import pylabtools from IPython.lib.kernel import ( get_connection_file, get_connection_info, connect_qtconsole )