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
201 changes: 0 additions & 201 deletions ipykernel/tests/test_serialize.py

This file was deleted.

9 changes: 1 addition & 8 deletions ipykernel/zmqshell.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,6 @@
from jupyter_core.paths import jupyter_runtime_dir
from jupyter_client.session import extract_header, Session

try:
# available since ipyparallel 5.0.0
from ipyparallel.engine.datapub import ZMQDataPublisher
except ImportError:
# Deprecated since ipykernel 4.3.0
from ipykernel.datapub import ZMQDataPublisher

#-----------------------------------------------------------------------------
# Functions and classes
#-----------------------------------------------------------------------------
Expand Down Expand Up @@ -445,7 +438,7 @@ class ZMQInteractiveShell(InteractiveShell):

displayhook_class = Type(ZMQShellDisplayHook)
display_pub_class = Type(ZMQDisplayPublisher)
data_pub_class = Type(ZMQDataPublisher)
data_pub_class = Any()
kernel = Any()
parent_header = Any()

Expand Down