##// END OF EJS Templates
Merge pull request #7129 from ccordoba12/pyqt5...
Thomas Kluyver -
r19568:bd69cc1f merge
parent child Browse files
Show More
@@ -47,7 +47,7 b' class HBChannel(Thread):'
47 47 _pause = None
48 48 _beating = None
49 49
50 def __init__(self, context, session, address):
50 def __init__(self, context=None, session=None, address=None):
51 51 """Create the heartbeat monitor thread.
52 52
53 53 Parameters
@@ -280,7 +280,7 b' class IPythonWidget(FrontendWidget):'
280 280 """Handle kernel info replies."""
281 281 content = rep['content']
282 282 if not self._guiref_loaded:
283 if content.get('language') == 'python':
283 if content.get('implementation') == 'ipython':
284 284 self._load_guiref_magic()
285 285 self._guiref_loaded = True
286 286
@@ -95,7 +95,7 b' class MagicHelper(QtGui.QDockWidget):'
95 95 self.search_line.textChanged[str].connect(
96 96 self.search_changed
97 97 )
98 self.search_list.itemDoubleClicked[QtGui.QListWidgetItem].connect(
98 self.search_list.itemDoubleClicked.connect(
99 99 self.paste_requested
100 100 )
101 101 self.paste_button.clicked[bool].connect(
General Comments 0
You need to be logged in to leave comments. Login now