hiro/emacs-ipython-notebook
1
0
Fork 0
mirror of https://github.com/vale981/emacs-ipython-notebook synced 2025-03-06 01:21:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Normalize url-or-port"

Browse source 
This reverts commit 435d001b03.
This commit is contained in:
dickmao 2018-10-15 14:13:51 -04:00
parent 2c2e1940d0
commit 257331f32c
3 changed files with 10 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
features/step-definitions/ein-steps.el
View file

@ -39,26 +39,6 @@
(ein:$notebook-notebook-name notebook))))
(switch-to-buffer buf-name)
(Then "I should be in buffer \"%s\"" buf-name))))))
(When "^I login if necessary"
(lambda ()
(multiple-value-bind (url-or-port token) (ein:jupyter-server-conn-info)
(when token
(When "I call \"ein:notebooklist-login\"")
(And "I wait for the smoke to clear")))))
(When "^I wait for the smoke to clear"
(lambda ()
(ein:testing-flush-queries)))
(When "^I enter the prevailing port"
(lambda ()
(multiple-value-bind (url-or-port token) (ein:jupyter-server-conn-info)
(let ((parsed-url (url-generic-parse-url url-or-port)))
(When "I type \"%d\"") (url-port parsed-url)))))
(When "^I wait for the smoke to clear"
(lambda ()
(ein:testing-flush-queries)))
(When "^I open notebooklist"
(lambda ()

3
lisp/ein-jupyter.el
View file

@ -23,6 +23,9 @@
;;; Code:
(require 'ein-core)
(require 'ein-notebooklist)
(defcustom ein:jupyter-server-buffer-name "*ein:jupyter-server*"
"The name of the buffer to run a jupyter notebook server
session in."

28
lisp/ein-notebooklist.el
View file

@ -32,11 +32,6 @@
(require 'ein-core)
(require 'ein-notebook)
;; needs to be after ein-notebook else deferred in server-start breaks down
;; has something to do with provide/require in contents-api
(require 'ein-jupyter)
(require 'ein-connect)
(require 'ein-file)
(require 'ein-contents-api)
@ -195,15 +190,10 @@ To suppress popup, you can pass `ignore' as CALLBACK."
(ein:$notebooklist-url-or-port it)
(ein:default-url-or-port)))))
(url-or-port
(if noninteractive
;; noninteractive for testing only
(multiple-value-bind (url-or-port token) (ein:jupyter-server-conn-info)
(let ((parsed-url (url-generic-parse-url url-or-port)))
(format "%d" (url-port parsed-url))))
(completing-read (format "URL or port number (default %s): " default)
url-or-port-list
nil nil nil nil
default))))
(completing-read (format "URL or port number (default %s): " default)
url-or-port-list
nil nil nil nil
default)))
(ein:url url-or-port)))
(defcustom ein:populate-hierarchy-on-notebooklist-open nil
@ -911,11 +901,7 @@ FIMXE: document how to use `ein:notebooklist-find-file-callback'
(defun ein:notebooklist-login (url-or-port password callback &optional retry-p)
"Login to URL-OR-PORT with PASSWORD with notebooklist-open CALLBACK of arity 0."
(interactive (list (ein:notebooklist-ask-url-or-port)
(if noninteractive
;; noninteractive for testing only
(multiple-value-bind (url-or-port token)
(ein:jupyter-server-conn-info) token)
(read-passwd "Password: "))
(read-passwd "Password: ")
nil))
(if password
(ein:query-singleton-ajax
@ -944,11 +930,11 @@ Now you can open notebook list by `ein:notebooklist-open" url-or-port)
(ein:log 'info "Failed to login to %s" url-or-port))
(defun* ein:notebooklist-login--complete (url-or-port &key data response
&allow-other-keys
&allow-other-keys
&aux (resp-string (format "STATUS: %s DATA: %s" (request-response-status-code response) data)))
(ein:log 'debug "ein:notebooklist-login--complete %s" resp-string))
(defun* ein:notebooklist-login--success (url-or-port callback
(defun* ein:notebooklist-login--success (url-or-port callback
&key data
&allow-other-keys)
(if (plist-get data :bad-page)