hiro/emacs-jupyter
1
0
Fork 0
mirror of https://github.com/vale981/emacs-jupyter synced 2025-03-06 07:51:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

jupyter-api-get-kernel-ws -> jupyter-api-kernel-websocket

Browse source 
* jupyter-rest-api.el: Do it.

* test/jupyter-server-test.el: Do it.
This commit is contained in:
Nathaniel Nicandro 2020-04-17 16:35:39 -05:00
parent ffcfdb6179
commit 591d51c9bc
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jupyter-rest-api.el
View file

@ -815,7 +815,7 @@ request."
;;;; Kernel websocket ;;;; Kernel websocket
(defun jupyter-api-get-kernel-ws (client id &rest plist) (defun jupyter-api-kernel-websocket (client id &rest plist)
"Return a websocket using CLIENT's ws-url slot. "Return a websocket using CLIENT's ws-url slot.
ID identifies the kernel to connect to, PLIST will be passed to ID identifies the kernel to connect to, PLIST will be passed to
the call to `websocket-open' to initialize the websocket. the call to `websocket-open' to initialize the websocket.

2
jupyter-server-ioloop.el
View file

@ -163,7 +163,7 @@ websocket.")
(cl-callf2 delq ws jupyter-server-connected-kernels)) (cl-callf2 delq ws jupyter-server-connected-kernels))
(defun jupyter-server-ioloop--connect (kernel-id) (defun jupyter-server-ioloop--connect (kernel-id)
(let ((ws (jupyter-api-get-kernel-ws (let ((ws (jupyter-api-kernel-websocket
jupyter-server-rest-client kernel-id jupyter-server-rest-client kernel-id
:on-error #'jupyter-server-ioloop--on-error :on-error #'jupyter-server-ioloop--on-error
:on-message #'jupyter-server-ioloop--on-message))) :on-message #'jupyter-server-ioloop--on-message)))

4
test/jupyter-server-test.el
View file

@ -184,14 +184,14 @@
(should cookies-copied-before-write) (should cookies-copied-before-write)
(should cookies-written))) (should cookies-written)))
(ert-deftest jupyter-api-get-kernel-ws () (ert-deftest jupyter-api-kernel-websocket ()
:tags '(rest) :tags '(rest)
(jupyter-test-rest-api-with-notebook client (jupyter-test-rest-api-with-notebook client
(cl-destructuring-bind (&key id &allow-other-keys) (cl-destructuring-bind (&key id &allow-other-keys)
(jupyter-api-start-kernel client) (jupyter-api-start-kernel client)
(unwind-protect (unwind-protect
(let ((kernel-id id) (let ((kernel-id id)
(ws (jupyter-api-get-kernel-ws client id))) (ws (jupyter-api-kernel-websocket client id)))
(unwind-protect (unwind-protect
(cl-destructuring-bind (&key id session &allow-other-keys) (cl-destructuring-bind (&key id session &allow-other-keys)
(websocket-client-data ws) (websocket-client-data ws)