summaryrefslogtreecommitdiff
path: root/silx/gui/console.py
diff options
context:
space:
mode:
authorPicca Frédéric-Emmanuel <picca@debian.org>2018-03-04 10:20:27 +0100
committerPicca Frédéric-Emmanuel <picca@debian.org>2018-03-04 10:20:27 +0100
commit270d5ddc31c26b62379e3caa9044dd75ccc71847 (patch)
tree55c5bfc851dfce7172d335cd2405b214323e3caf /silx/gui/console.py
parente19c96eff0c310c06c4f268c8b80cb33bd08996f (diff)
New upstream version 0.7.0+dfsg
Diffstat (limited to 'silx/gui/console.py')
-rw-r--r--silx/gui/console.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/silx/gui/console.py b/silx/gui/console.py
index 7812e2d..3c69419 100644
--- a/silx/gui/console.py
+++ b/silx/gui/console.py
@@ -129,7 +129,10 @@ if qtconsole is None:
IPython.external.qt_loaders.has_binding = has_binding
- from IPython.qt.console.rich_ipython_widget import RichIPythonWidget
+ try:
+ from IPython.qtconsole.rich_ipython_widget import RichIPythonWidget
+ except ImportError:
+ from IPython.qt.console.rich_ipython_widget import RichIPythonWidget
from IPython.qt.inprocess import QtInProcessKernelManager