Skip to content

Commit

Permalink
Revert "add shim for external/qt_for_kernel.py"
Browse files Browse the repository at this point in the history
This reverts commit 91d98a4.
  • Loading branch information
zpincus committed Sep 24, 2015
1 parent 91d98a4 commit 00fa539
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
3 changes: 0 additions & 3 deletions IPython/external/qt_for_kernel.py

This file was deleted.

11 changes: 5 additions & 6 deletions IPython/lib/qt_for_kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
Import Priority:
if Qt has been imported anywhere else:
if Qt4 has been imported anywhere else:
use that
if matplotlib has been imported and doesn't support v2 (<= 1.0.1):
use PyQt4 @v1
Next, ask QT_API env variable
Next, ask ETS' QT_API env variable
if QT_API not set:
ask matplotlib via rcParams['backend.qt4']
Expand All @@ -26,7 +26,8 @@
except:
fallback on PySide
else:
use what QT_API says
use PyQt @v2 or PySide, depending on QT_API
because ETS doesn't work with PyQt @v1.
"""

Expand All @@ -41,9 +42,7 @@
_qt_apis = (QT_API_PYSIDE, QT_API_PYQT, QT_API_PYQT5, QT_API_PYQTv1,
QT_API_PYQT_DEFAULT)

# Constraints placed on an imported matplotlib
# TODO: check that this is still consistent with what matplotlib supports,
# in particular with regard to qt5.
#Constraints placed on an imported matplotlib
def matplotlib_options(mpl):
if mpl is None:
return
Expand Down

0 comments on commit 00fa539

Please sign in to comment.