From 3e9b03a099bd0d93c3014642c53a920e89066e1e 2013-06-27 18:14:07
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: 2013-06-27 18:14:07
Subject: [PATCH] Fix all imports for Qt console.

---

diff --git a/IPython/qt/console/console_widget.py b/IPython/qt/console/console_widget.py
index ea68ea3..05ac076 100644
--- a/IPython/qt/console/console_widget.py
+++ b/IPython/qt/console/console_widget.py
@@ -18,8 +18,8 @@ from IPython.external.qt import QtCore, QtGui
 # Local imports
 from IPython.config.configurable import LoggingConfigurable
 from IPython.core.inputsplitter import ESC_SEQUENCES
-from IPython.frontend.qt.rich_text import HtmlExporter
-from IPython.frontend.qt.util import MetaQObjectHasTraits, get_font
+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 ansi_code_processor import QtAnsiCodeProcessor
diff --git a/IPython/qt/console/frontend_widget.py b/IPython/qt/console/frontend_widget.py
index d36b628..2b9b6e8 100644
--- a/IPython/qt/console/frontend_widget.py
+++ b/IPython/qt/console/frontend_widget.py
@@ -15,7 +15,7 @@ from IPython.external.qt import QtCore, QtGui
 from IPython.core.inputsplitter import InputSplitter, IPythonInputSplitter
 from IPython.core.inputtransformer import classic_prompt
 from IPython.core.oinspect import call_tip
-from IPython.frontend.qt.base_frontend_mixin import BaseFrontendMixin
+from IPython.qt.base_frontend_mixin import BaseFrontendMixin
 from IPython.utils.traitlets import Bool, Instance, Unicode
 from bracket_matcher import BracketMatcher
 from call_tip_widget import CallTipWidget
diff --git a/IPython/qt/console/qtconsoleapp.py b/IPython/qt/console/qtconsoleapp.py
index f377ddd..1636d15 100644
--- a/IPython/qt/console/qtconsoleapp.py
+++ b/IPython/qt/console/qtconsoleapp.py
@@ -57,19 +57,19 @@ from IPython.external.qt import QtCore, QtGui
 from IPython.config.application import boolean_flag, catch_config_error
 from IPython.core.application import BaseIPythonApplication
 from IPython.core.profiledir import ProfileDir
-from IPython.frontend.qt.console.ipython_widget import IPythonWidget
-from IPython.frontend.qt.console.rich_ipython_widget import RichIPythonWidget
-from IPython.frontend.qt.console import styles
-from IPython.frontend.qt.console.mainwindow import MainWindow
-from IPython.frontend.qt.client import QtKernelClient
-from IPython.frontend.qt.manager import QtKernelManager
+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.kernel import tunnel_to_kernel, find_connection_file
 from IPython.utils.traitlets import (
     Dict, List, Unicode, CBool, Any
 )
 from IPython.kernel.zmq.session import default_secure
 
-from IPython.frontend.consoleapp import (
+from IPython.consoleapp import (
         IPythonConsoleApp, app_aliases, app_flags, flags, aliases
     )
 
diff --git a/IPython/qt/console/rich_ipython_widget.py b/IPython/qt/console/rich_ipython_widget.py
index 368eb28..bf2f85d 100644
--- a/IPython/qt/console/rich_ipython_widget.py
+++ b/IPython/qt/console/rich_ipython_widget.py
@@ -16,7 +16,7 @@ from IPython.external.qt import QtCore, QtGui
 
 # Local imports
 from IPython.utils.traitlets import Bool
-from IPython.frontend.qt.svg import save_svg, svg_to_clipboard, svg_to_image
+from IPython.qt.svg import save_svg, svg_to_clipboard, svg_to_image
 from ipython_widget import IPythonWidget