From fca3671d4ed99553dda6c032ddda6c1b905787ad Mon Sep 17 00:00:00 2001 From: Nathaniel Nicandro Date: Mon, 6 Apr 2020 22:55:32 -0500 Subject: [PATCH] jupyter-meta-kernel -> jupyter-kernel --- jupyter-kernel-manager.el | 10 +++++----- jupyter-kernel-process-manager.el | 2 +- jupyter-server.el | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jupyter-kernel-manager.el b/jupyter-kernel-manager.el index 4764b9e..1077bf4 100644 --- a/jupyter-kernel-manager.el +++ b/jupyter-kernel-manager.el @@ -76,9 +76,9 @@ (cl-defmethod jupyter-kernel-died ((_kernel jupyter-kernel-lifetime)) (ignore)) -;;; `jupyter-meta-kernel' +;;; `jupyter-kernel' -(defclass jupyter-meta-kernel (jupyter-kernel-lifetime) +(defclass jupyter-kernel (jupyter-kernel-lifetime) ((spec :type cons :initarg :spec @@ -102,10 +102,10 @@ implementation of `jupyter-kill-kernel'. A convenience method, `jupyter-kernel-name', is provided to access the name of the kernelspec.") -(cl-defmethod jupyter-kill-kernel ((_kernel jupyter-meta-kernel)) +(cl-defmethod jupyter-kill-kernel ((_kernel jupyter-kernel)) (ignore)) -(cl-defmethod jupyter-kernel-name ((kernel jupyter-meta-kernel)) +(cl-defmethod jupyter-kernel-name ((kernel jupyter-kernel)) "Return the name of KERNEL." (car (oref kernel spec))) @@ -117,7 +117,7 @@ access the name of the kernelspec.") jupyter-instance-tracker) ((tracking-symbol :initform 'jupyter--kernel-managers) (kernel - :type jupyter-meta-kernel + :type jupyter-kernel :initarg :kernel :documentation "The kernel that is being managed.")) :abstract t) diff --git a/jupyter-kernel-process-manager.el b/jupyter-kernel-process-manager.el index 09072a8..a2e89d9 100644 --- a/jupyter-kernel-process-manager.el +++ b/jupyter-kernel-process-manager.el @@ -71,7 +71,7 @@ error. The error is raised before :timeout-form is evaluated." ;;; `jupyter-kernel-process' -(defclass jupyter-kernel-process (jupyter-meta-kernel) +(defclass jupyter-kernel-process (jupyter-kernel) ((process :type process :documentation "The kernel process.")) diff --git a/jupyter-server.el b/jupyter-server.el index 0b750c8..948cbfc 100644 --- a/jupyter-server.el +++ b/jupyter-server.el @@ -127,7 +127,7 @@ Access should be done through `jupyter-available-kernelspecs'."))) ;;; `jupyter-server-kernel' ;; TODO: Add the server as a slot -(defclass jupyter-server-kernel (jupyter-meta-kernel) +(defclass jupyter-server-kernel (jupyter-kernel) ((server :type jupyter-server :initarg :server