Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion IPython/kernel/channels.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion IPython/qt/console/ipython_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ def _handle_kernel_info_reply(self, rep):
"""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

Expand Down
2 changes: 1 addition & 1 deletion IPython/qt/console/magic_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def sizeHint(self):
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(
Expand Down