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

Make jupyter-initialize-connection a function instead of a method

Browse source 
Initializing a connection does not change depending on the client. Or at least
it doesn't seem likely.
This commit is contained in:
Nathaniel Nicandro 2018-01-17 20:15:50 -06:00
parent 91a45c3ce3
commit 1159342c26
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
jupyter-client.el
View file

@ -130,8 +130,7 @@ variables and intermediate ioloop process output.")
(cl-call-next-method)
(oset client -buffer (generate-new-buffer " *jupyter-kernel-client*")))
(cl-defmethod jupyter-initialize-connection ((client jupyter-kernel-client)
&optional file-or-plist)
(defun jupyter-initialize-connection (client &optional file-or-plist)
"Initialize CLIENT with a connection FILE-OR-PLIST.
When FILE-OR-PLIST is a file name, read the JSON connection
information from the file and initialize CLIENT's connection and
@ -144,6 +143,7 @@ http://jupyter-client.readthedocs.io/en/latest/kernels.html#connection-files.
As a side effect, if CLIENT is already connected to a kernel its
connection is terminated before initializing."
(cl-check-type client jupyter-kernel-client)
(let ((conn-info (if file-or-plist
(oset client conn-info
(if (json-plist-p file-or-plist) file-or-plist
@ -151,6 +151,8 @@ connection is terminated before initializing."
(json-object-type 'plist)
(json-false nil))
(json-read-file file-or-plist))))
;; The conn-info slot is shared with a client's
;; parent-instance, see if the parent instance has it
(or (ignore-errors (oref client conn-info))
(signal 'unbound-slot
(list 'json-plist client 'conn-info))))))