update dependency imports

avoiding IPython shims

jupyter_qtconsole/client.py

@@ -11,14 +11,14 @@
 from zmq import ZMQError
 from zmq.eventloop import ioloop, zmqstream
 
-from IPython.external.qt import QtCore
+from jupyter_qtconsole.qt import QtCore
 
 # Local imports
-from IPython.utils.traitlets import Type, Instance
-from IPython.kernel.channels import HBChannel
-from IPython.kernel import KernelClient
-from IPython.kernel.channels import InvalidPortNumber
-from IPython.kernel.threaded import ThreadedKernelClient, ThreadedZMQSocketChannel
+from traitlets import Type, Instance
+from jupyter_client.channels import HBChannel
+from jupyter_client import KernelClient
+from jupyter_client.channels import InvalidPortNumber
+from jupyter_client.threaded import ThreadedKernelClient, ThreadedZMQSocketChannel
 
 from .kernel_mixins import QtKernelClientMixin
 from .util import SuperQObject
@@ -36,9 +36,9 @@ def call_handlers(self, since_last_heartbeat):
         # Emit the generic signal.
         self.kernel_died.emit(since_last_heartbeat)
 
-from IPython.core.release import kernel_protocol_version_info
+from jupyter_client import protocol_version_info
 
-major_protocol_version = kernel_protocol_version_info[0]
+major_protocol_version = protocol_version_info[0]
 
 class QtZMQSocketChannel(ThreadedZMQSocketChannel,SuperQObject):
     """A ZMQ socket emitting a Qt signal when a message is received."""

jupyter_qtconsole/console/__main__.py

@@ -1,3 +1,3 @@
 if __name__ == '__main__':
-    from IPython.qt.console.qtconsoleapp import main
+    from jupyter_qtconsole.console.qtconsoleapp import main
     main()

jupyter_qtconsole/console/ansi_code_processor.py

@@ -9,10 +9,10 @@
 import re
 
 # System library imports
-from IPython.external.qt import QtGui
+from jupyter_qtconsole.qt import QtGui
 
 # Local imports
-from IPython.utils.py3compat import string_types
+from ipython_genutils.py3compat import string_types
 
 #-----------------------------------------------------------------------------
 # Constants and datatypes

jupyter_qtconsole/console/bracket_matcher.py

@@ -2,7 +2,7 @@
 """
 
 # System library imports
-from IPython.external.qt import QtCore, QtGui
+from jupyter_qtconsole.qt import QtCore, QtGui
 
 
 class BracketMatcher(QtCore.QObject):

jupyter_qtconsole/console/call_tip_widget.py

@@ -3,7 +3,7 @@
 from unicodedata import category
 
 # System library imports
-from IPython.external.qt import QtCore, QtGui
+from jupyter_qtconsole.qt import QtCore, QtGui
 
 
 class CallTipWidget(QtGui.QLabel):

jupyter_qtconsole/console/completion_html.py

@@ -9,9 +9,9 @@
 #-----------------------------------------------------------------------------
 
 # System library imports
-import IPython.utils.text as text
+import ipython_genutils.text as text
 
-from IPython.external.qt import QtCore, QtGui
+from jupyter_qtconsole.qt import QtCore, QtGui
 
 #--------------------------------------------------------------------------
 # Return an HTML table with selected item in a special class

jupyter_qtconsole/console/completion_plain.py

@@ -8,8 +8,8 @@
 #-------------------------------------------------------------------
 
 # System library imports
-from IPython.external.qt import QtCore, QtGui
-import IPython.utils.text as text
+from jupyter_qtconsole.qt import QtCore, QtGui
+import ipython_genutils.text as text
 
 
 class CompletionPlain(QtGui.QWidget):

jupyter_qtconsole/console/completion_widget.py

@@ -1,6 +1,6 @@
 """A dropdown completer widget for the qtconsole."""
 # System library imports
-from IPython.external.qt import QtCore, QtGui
+from jupyter_qtconsole.qt import QtCore, QtGui
 
 
 class CompletionWidget(QtGui.QListWidget):

jupyter_qtconsole/console/console_widget.py

@@ -14,15 +14,15 @@
 import webbrowser
 
 # System library imports
-from IPython.external.qt import QtCore, QtGui
+from jupyter_qtconsole.qt import QtCore, QtGui
 
 # Local imports
-from IPython.config.configurable import LoggingConfigurable
+from traitlets.config.configurable import LoggingConfigurable
 from IPython.core.inputsplitter import ESC_SEQUENCES
-from IPython.qt.rich_text import HtmlExporter
-from IPython.qt.util import MetaQObjectHasTraits, get_font
-from IPython.utils.text import columnize
-from IPython.utils.traitlets import Bool, Enum, Integer, Unicode
+from jupyter_qtconsole.rich_text import HtmlExporter
+from jupyter_qtconsole.util import MetaQObjectHasTraits, get_font
+from ipython_genutils.text import columnize
+from traitlets import Bool, Enum, Integer, Unicode
 from .ansi_code_processor import QtAnsiCodeProcessor
 from .completion_widget import CompletionWidget
 from .completion_html import CompletionHtml

jupyter_qtconsole/console/frontend_widget.py

@@ -9,16 +9,16 @@
 import sys
 import uuid
 
-from IPython.external import qt
-from IPython.external.qt import QtCore, QtGui
-from IPython.utils import py3compat
-from IPython.utils.importstring import import_item
+from jupyter_qtconsole import qt
+from jupyter_qtconsole.qt import QtCore, QtGui
+from ipython_genutils import py3compat
+from ipython_genutils.importstring import import_item
 
 from IPython.core.inputsplitter import InputSplitter, IPythonInputSplitter
 from IPython.core.inputtransformer import classic_prompt
 from IPython.core.oinspect import call_tip
-from IPython.qt.base_frontend_mixin import BaseFrontendMixin
-from IPython.utils.traitlets import Any, Bool, Instance, Unicode, DottedObjectName
+from jupyter_qtconsole.base_frontend_mixin import BaseFrontendMixin
+from traitlets import Any, Bool, Instance, Unicode, DottedObjectName
 from .bracket_matcher import BracketMatcher
 from .call_tip_widget import CallTipWidget
 from .history_console_widget import HistoryConsoleWidget

jupyter_qtconsole/console/history_console_widget.py

@@ -1,9 +1,9 @@
 # System library imports
-from IPython.external.qt import QtGui
+from jupyter_qtconsole.qt import QtGui
 
 # Local imports
-from IPython.utils.py3compat import unicode_type
-from IPython.utils.traitlets import Bool
+from ipython_genutils.py3compat import unicode_type
+from traitlets import Bool
 from .console_widget import ConsoleWidget
 
 

jupyter_qtconsole/console/ipython_widget.py

@@ -14,12 +14,12 @@
 import time
 from textwrap import dedent
 
-from IPython.external.qt import QtCore, QtGui
+from jupyter_qtconsole.qt import QtCore, QtGui
 
 from IPython.core.inputsplitter import IPythonInputSplitter
-from IPython.core.release import version
+from jupyter_qtconsole import __version__
 from IPython.core.inputtransformer import ipy_prompt
-from IPython.utils.traitlets import Bool, Unicode
+from traitlets import Bool, Unicode
 from .frontend_widget import FrontendWidget
 from . import styles
 
@@ -36,7 +36,7 @@
 default_output_sep2 = ''
 
 # Base path for most payload sources.
-zmq_shell_source = 'IPython.kernel.zmq.zmqshell.ZMQInteractiveShell'
+zmq_shell_source = 'ipython_kernel.zmqshell.ZMQInteractiveShell'
 
 if sys.platform.startswith('win'):
     default_editor = 'notepad'
@@ -591,4 +591,4 @@ def _syntax_style_changed(self):
     #------ Trait default initializers -----------------------------------------
 
     def _banner_default(self):
-        return "IPython QtConsole {version}\n".format(version=version)
+        return "Jupyter QtConsole {version}\n".format(version=__version__)

jupyter_qtconsole/console/kill_ring.py

@@ -5,7 +5,7 @@
 #-----------------------------------------------------------------------------
 
 # System library imports
-from IPython.external.qt import QtCore, QtGui
+from jupyter_qtconsole.qt import QtCore, QtGui
 
 #-----------------------------------------------------------------------------
 # Classes

jupyter_qtconsole/console/magic_helper.py

@@ -14,13 +14,13 @@
 import sys
 
 # System library imports
-from IPython.external.qt import QtGui,QtCore
+from jupyter_qtconsole.qt import QtGui,QtCore
 
 from IPython.core.magic import magic_escapes
 
 class MagicHelper(QtGui.QDockWidget):
     """MagicHelper - dockable widget for convenient search and running of
-                     magic command for IPython QtConsole.
+                     magic command for Jupyter QtConsole.
     """
 
     #---------------------------------------------------------------------------

jupyter_qtconsole/console/mainwindow.py

@@ -20,7 +20,7 @@
 from threading import Thread
 
 # System library imports
-from IPython.external.qt import QtGui,QtCore
+from jupyter_qtconsole.qt import QtGui,QtCore
 
 from IPython.core.magic import magic_escapes
 

jupyter_qtconsole/console/pygments_highlighter.py

@@ -1,12 +1,12 @@
 # System library imports.
-from IPython.external.qt import QtGui
+from jupyter_qtconsole.qt import QtGui
 from pygments.formatters.html import HtmlFormatter
 from pygments.lexer import RegexLexer, _TokenType, Text, Error
 from pygments.lexers import PythonLexer
 from pygments.styles import get_style_by_name
 
 # Local imports
-from IPython.utils.py3compat import string_types
+from ipython_genutils.py3compat import string_types
 
 def get_tokens_unprocessed(self, text, stack=('root',)):
     """ Split ``text`` into (tokentype, text) pairs.

jupyter_qtconsole/console/qtconsoleapp.py

@@ -31,7 +31,7 @@ def gui_excepthook(exctype, value, tb):
         try:
             import ctypes, traceback
             MB_ICONERROR = 0x00000010
-            title = u'Error starting IPython QtConsole'
+            title = u'Error starting QtConsole'
             msg = u''.join(traceback.format_exception(exctype, value, tb))
             ctypes.windll.user32.MessageBoxW(0, msg, title, MB_ICONERROR)
         finally:
@@ -41,38 +41,31 @@ def gui_excepthook(exctype, value, tb):
 
     sys.excepthook = gui_excepthook
 
-from IPython.external.qt import QtCore, QtGui
-
-from IPython.config.application import boolean_flag
-from IPython.config.application import catch_config_error
-from IPython.core.application import BaseIPythonApplication
-from IPython.qt.console.ipython_widget import IPythonWidget
-from IPython.qt.console.rich_ipython_widget import RichIPythonWidget
-from IPython.qt.console import styles
-from IPython.qt.console.mainwindow import MainWindow
-from IPython.qt.client import QtKernelClient
-from IPython.qt.manager import QtKernelManager
-from IPython.utils.traitlets import (
+from jupyter_qtconsole.qt import QtCore, QtGui
+
+from traitlets.config.application import boolean_flag
+from traitlets.config.application import catch_config_error
+from jupyter_qtconsole.console.ipython_widget import IPythonWidget
+from jupyter_qtconsole.console.rich_ipython_widget import RichIPythonWidget
+from jupyter_qtconsole.console import styles
+from jupyter_qtconsole.console.mainwindow import MainWindow
+from jupyter_qtconsole.client import QtKernelClient
+from jupyter_qtconsole.manager import QtKernelManager
+from traitlets import (
     Dict, Unicode, CBool, Any
 )
 
-from IPython.consoleapp import (
-        IPythonConsoleApp, app_aliases, app_flags, flags, aliases
+from jupyter_core.application import JupyterApp
+from jupyter_client.consoleapp import (
+        JupyterConsoleApp, app_aliases, app_flags, flags, aliases
     )
 
-#-----------------------------------------------------------------------------
-# Network Constants
-#-----------------------------------------------------------------------------
 
-from IPython.utils.localinterfaces import is_local_ip
+from jupyter_client.localinterfaces import is_local_ip
 
-#-----------------------------------------------------------------------------
-# Globals
-#-----------------------------------------------------------------------------
 
 _examples = """
-ipython qtconsole                      # start the qtconsole
-ipython qtconsole --matplotlib=inline  # start with matplotlib inline plotting mode
+jupyter qtconsole                      # start the qtconsole
 """
 
 #-----------------------------------------------------------------------------
@@ -82,11 +75,11 @@ def gui_excepthook(exctype, value, tb):
 # start with copy of flags
 flags = dict(flags)
 qt_flags = {
-    'plain' : ({'IPythonQtConsoleApp' : {'plain' : True}},
+    'plain' : ({'JupyterQtConsoleApp' : {'plain' : True}},
             "Disable rich text support."),
 }
 qt_flags.update(boolean_flag(
-    'banner', 'IPythonQtConsoleApp.display_banner',
+    'banner', 'JupyterQtConsoleApp.display_banner',
     "Display a banner upon starting the QtConsole.",
     "Don't display a banner upon starting the QtConsole."
 ))
@@ -100,7 +93,7 @@ def gui_excepthook(exctype, value, tb):
 aliases = dict(aliases)
 qt_aliases = dict(
     style = 'IPythonWidget.syntax_style',
-    stylesheet = 'IPythonQtConsoleApp.stylesheet',
+    stylesheet = 'JupyterQtConsoleApp.stylesheet',
 
     editor = 'IPythonWidget.editor',
     paging = 'ConsoleWidget.paging',
@@ -116,36 +109,24 @@ def gui_excepthook(exctype, value, tb):
 qt_aliases = set(qt_aliases.keys())
 qt_flags = set(qt_flags.keys())
 
-#-----------------------------------------------------------------------------
-# Classes
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-# IPythonQtConsole
-#-----------------------------------------------------------------------------
 
+class JupyterQtConsoleApp(object):
+    pass
 
-class IPythonQtConsoleApp(BaseIPythonApplication, IPythonConsoleApp):
-    name = 'ipython-qtconsole'
+class JupyterQtConsoleApp(JupyterApp, JupyterConsoleApp, JupyterQtConsoleApp):
+    name = 'jupyter-qtconsole'
 
     description = """
-        The IPython QtConsole.
+        The Jupyter QtConsole.
         
         This launches a Console-style application using Qt.  It is not a full
         console, in that launched terminal subprocesses will not be able to accept
         input.
         
-        The QtConsole supports various extra features beyond the Terminal IPython
-        shell, such as inline plotting with matplotlib, via:
-        
-            ipython qtconsole --matplotlib=inline
-        
-        as well as saving your session as HTML, and printing the output.
-        
     """
     examples = _examples
 
-    classes = [IPythonWidget] + IPythonConsoleApp.classes
+    classes = [IPythonWidget] + JupyterConsoleApp.classes
     flags = Dict(flags)
     aliases = Dict(aliases)
     frontend_flags = Any(qt_flags)
@@ -181,7 +162,7 @@ def _plain_changed(self, name, old, new):
     widget_factory = Any(RichIPythonWidget)
 
     def parse_command_line(self, argv=None):
-        super(IPythonQtConsoleApp, self).parse_command_line(argv)
+        super(JupyterQtConsoleApp, self).parse_command_line(argv)
         self.build_kernel_argv(self.extra_args)
 
 
@@ -346,8 +327,8 @@ def init_signal(self):
     @catch_config_error
     def initialize(self, argv=None):
         self.init_qt_app()
-        super(IPythonQtConsoleApp, self).initialize(argv)
-        IPythonConsoleApp.initialize(self,argv)
+        super(JupyterQtConsoleApp, self).initialize(argv)
+        JupyterConsoleApp.initialize(self,argv)
         self.init_qt_elements()
         self.init_signal()
 
@@ -368,7 +349,7 @@ def start(self):
 #-----------------------------------------------------------------------------
 
 def main():
-    app = IPythonQtConsoleApp()
+    app = JupyterQtConsoleApp()
     app.initialize()
     app.start()