remove f.el dependency

This commit is contained in:
dickmao 2018-11-08 11:49:24 -05:00
parent e6d377bad0
commit 52ae7c2e31
4 changed files with 5 additions and 6 deletions

View file

@ -381,7 +381,7 @@ auto-execution mode flag in the connected buffer is `t'.")))
(status_dead.Kernel . "Kernel requires restart \\[ein:notebook-restart-kernel-command]")
(status_reconnecting.Kernel . "Kernel reconnecting...")
(status_reconnected.Kernel . "Kernel reconnected")
(status_disconnected.Kernel . "Kernel requires reconnect \\[ein:notebook-reconnect-session-command]")))
(status_disconnected.Kernel . "Kernel requires reconnect \\[ein:notebook-reconnect-kernel]")))
:type ein:notification-status))
"Notification widget for Notebook.")

View file

@ -39,7 +39,6 @@
(require 'deferred)
(require 'dash)
(require 'ido)
(require 'f)
(defcustom ein:notebooklist-login-timeout (truncate (* 6.3 1000))
"Timeout in milliseconds for logging into server"
@ -877,7 +876,7 @@ CALLBACK takes one argument, the buffer created by ein:notebooklist-open--succes
(securep (string-match "^wss://" url-or-port)))
(loop for (name content) on cookie-plist by (function cddr)
for line = (mapconcat #'identity (list domain "FALSE" (car (url-path-and-query parsed-url)) (if securep "TRUE" "FALSE") "0" (symbol-name name) (concat content "\n")) "\t")
do (f-append-text line 'utf-8 (request--curl-cookie-jar)))))
do (write-region line nil (request--curl-cookie-jar) 'append))))
(lexical-let* (done-p
(done-callback (lambda (&rest ignore) (setf done-p t)))

View file

@ -8,6 +8,5 @@
(request-deferred "0.2.0")
(cl-generic "0.3")
(dash "2.13.0")
(f "0.19.0")
(s "1.11.0")
(skewer-mode "1.6.2")))

View file

@ -31,7 +31,6 @@
(require 'ein-jupyter)
(require 'ein-file)
(require 'ein-notebooklist)
(require 'f)
(defcustom ein:process-jupyter-regexp "\\(jupyter\\|ipython\\)\\(-\\|\\s-+\\)note"
"Regexp by which we recognize notebook servers."
@ -141,7 +140,9 @@
"Return the uppermost parent dir of DIR that contains ipynb files."
(let ((fn (expand-file-name filename)))
(loop with directory = (directory-file-name
(if (f-file? fn) (f-parent fn) fn))
(if (file-regular-p fn)
(file-name-directory (directory-file-name fn))
fn))
with suitable = directory
until (string= (file-name-nondirectory directory) "")
do (if (directory-files directory nil "\\.ipynb$")