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

Make ipython executable for console configurable

Browse source
This commit is contained in:
Takafumi Arakaki 2012-06-09 03:36:08 +02:00
parent ea6bdb9a98
commit 5a73b7b593
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ein-notebook.el
View file

@ -1147,6 +1147,24 @@ function : Called with an argument URL-OR-PORT (integer or string).
url-or-port)))) url-or-port))))
:group 'ein) :group 'ein)
(defcustom ein:notebook-console-executable (executable-find "ipython")
"IPython executable used for console.
Example: \"/user/bin/ipython\"
Types same as `ein:notebook-console-security-dir' are accepted."
:type '(choice
(string :tag "IPython executable" "/user/bin/ipython")
(alist :tag "IPython executable mapping"
:key-type (choice :tag "URL or PORT"
(string :tag "URL" "http://127.0.0.1:8888")
(integer :tag "PORT" 8888)
(const default))
:value-type (string :tag "IPython executable"
"/user/bin/ipython"))
(function :tag "IPython executable getter"
(lambda (url-or-port) (executable-find "ipython"))))
:group 'ein)
(defcustom ein:notebook-console-args "--profile nbserver" (defcustom ein:notebook-console-args "--profile nbserver"
"Additional argument when using console. "Additional argument when using console.
@ -1174,6 +1192,10 @@ Types same as `ein:notebook-console-security-dir' are accepted."
dir dir
(file-name-as-directory (expand-file-name dir))))) (file-name-as-directory (expand-file-name dir)))))
(defun ein:notebook-console-executable-get (notebook)
(ein:choose-setting 'ein:notebook-console-executable
(ein:$notebook-url-or-port notebook)))
(defun ein:notebook-console-args-get (notebook) (defun ein:notebook-console-args-get (notebook)
(ein:choose-setting 'ein:notebook-console-args (ein:choose-setting 'ein:notebook-console-args
(ein:$notebook-url-or-port notebook))) (ein:$notebook-url-or-port notebook)))
@ -1193,7 +1215,7 @@ https://github.com/fgallina/python.el"
(let* ((dir (ein:notebook-console-security-dir-get ein:notebook)) (let* ((dir (ein:notebook-console-security-dir-get ein:notebook))
(kid (ein:$kernel-kernel-id (kid (ein:$kernel-kernel-id
(ein:$notebook-kernel ein:notebook))) (ein:$notebook-kernel ein:notebook)))
(ipy (executable-find "ipython")) (ipy (ein:notebook-console-executable-get ein:notebook))
(args (ein:notebook-console-args-get ein:notebook)) (args (ein:notebook-console-args-get ein:notebook))
(python-shell-setup-codes nil) (python-shell-setup-codes nil)
(python-shell-interpreter (python-shell-interpreter