Skip to content

fix: Backwards compat with older versions of zmq #665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SylvainCorlay merged 1 commit into from
May 12, 2021
Merged

fix: Backwards compat with older versions of zmq #665

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions ipykernel/debugger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
from IPython.core.getipython import get_ipython
import debugpy

# Required for backwards compatiblity
ROUTING_ID = getattr(zmq, 'ROUTING_ID', None) or zmq.IDENTITY

class DebugpyMessageQueue:

HEADER = 'Content-Length: '
Expand Down Expand Up @@ -119,7 +122,7 @@ def _forward_event(self, msg):

def _send_request(self, msg):
if self.routing_id is None:
self.routing_id = self.debugpy_stream.socket.getsockopt(zmq.ROUTING_ID)
self.routing_id = self.debugpy_stream.socket.getsockopt(ROUTING_ID)
content = jsonapi.dumps(msg)
content_length = str(len(content))
buf = (DebugpyMessageQueue.HEADER + content_length + DebugpyMessageQueue.SEPARATOR).encode('ascii')
Expand Down Expand Up @@ -166,7 +169,7 @@ def get_host_port(self):

def connect_tcp_socket(self):
self.debugpy_stream.socket.connect(self._get_endpoint())
self.routing_id = self.debugpy_stream.socket.getsockopt(zmq.ROUTING_ID)
self.routing_id = self.debugpy_stream.socket.getsockopt(ROUTING_ID)

def disconnect_tcp_socket(self):
self.debugpy_stream.socket.disconnect(self._get_endpoint())
Expand Down Expand Up @@ -260,7 +263,7 @@ def start(self):
'silent': True
}
self.session.send(self.shell_socket, 'execute_request', content,
None, (self.shell_socket.getsockopt(zmq.ROUTING_ID)))
None, (self.shell_socket.getsockopt(ROUTING_ID)))

ident, msg = self.session.recv(self.shell_socket, mode=0)
self.debugpy_initialized = msg['content']['status'] == 'ok'
Expand Down