Fix ImportError with default PyQt5 backend (PY-20532)

python/helpers/pydev/pydev_ipython/inputhookqt5.py

@@ -22,7 +22,7 @@ import signal
 import threading
 
 
-from pydev_ipython.qt_for_kernel import QtCore, QtGui
+from PyQt5 import QtCore, QtGui
 from pydev_ipython.inputhook import allow_CTRL_C, ignore_CTRL_C, stdin_ready
 
 # To minimise future merging complexity, rather than edit the entire code base below

python/helpers/pydev/pydev_ipython/matplotlibtools.py

@@ -48,7 +48,6 @@ def find_gui_and_backend():
     # In this case, we need to find what the appropriate gui selection call
     # should be for IPython, so we can activate inputhook accordingly
     gui = backend2gui.get(backend, None)
-    print("gui", gui)
     return gui, backend
 
 

python/helpers/pydev/pydev_ipython/qt_loaders.py

@@ -251,7 +251,7 @@ def load_qt(api_options):
 
         if api not in loaders:
             raise RuntimeError(
-                "Invalid Qt API %r, valid values are: %r, %r, %r, %r" %
+                "Invalid Qt API %r, valid values are: %r, %r, %r, %r, %r" %
                 (api, QT_API_PYSIDE, QT_API_PYQT,
                  QT_API_PYQTv1, QT_API_PYQT_DEFAULT, QT_API_PYQT5))