From bd69cc1f46898192e7b9eb7237e3603d1de9d019 2014-12-15 19:42:12
From: Thomas Kluyver <takowl@gmail.com>
Date: 2014-12-15 19:42:12
Subject: [PATCH] Merge pull request #7129 from ccordoba12/pyqt5

Complete qtconsole PyQt5 port
---

diff --git a/IPython/kernel/channels.py b/IPython/kernel/channels.py
index b22cfba..f9b8d93 100644
--- a/IPython/kernel/channels.py
+++ b/IPython/kernel/channels.py
@@ -47,7 +47,7 @@ class HBChannel(Thread):
     _pause = None
     _beating = None
 
-    def __init__(self, context, session, address):
+    def __init__(self, context=None, session=None, address=None):
         """Create the heartbeat monitor thread.
 
         Parameters
diff --git a/IPython/qt/console/ipython_widget.py b/IPython/qt/console/ipython_widget.py
index c9cbe8c..477423c 100644
--- a/IPython/qt/console/ipython_widget.py
+++ b/IPython/qt/console/ipython_widget.py
@@ -280,7 +280,7 @@ class IPythonWidget(FrontendWidget):
         """Handle kernel info replies."""
         content = rep['content']
         if not self._guiref_loaded:
-            if content.get('language') == 'python':
+            if content.get('implementation') == 'ipython':
                 self._load_guiref_magic()
             self._guiref_loaded = True
         
diff --git a/IPython/qt/console/magic_helper.py b/IPython/qt/console/magic_helper.py
index d599b50..ef6b59b 100644
--- a/IPython/qt/console/magic_helper.py
+++ b/IPython/qt/console/magic_helper.py
@@ -95,7 +95,7 @@ class MagicHelper(QtGui.QDockWidget):
         self.search_line.textChanged[str].connect(
             self.search_changed
         )
-        self.search_list.itemDoubleClicked[QtGui.QListWidgetItem].connect(
+        self.search_list.itemDoubleClicked.connect(
             self.paste_requested
         )
         self.paste_button.clicked[bool].connect(