diff options
| author | Nathaniel Nicandro <nrn12@uic.edu> | 2017-04-29 16:26:33 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-04-29 16:26:33 +0200 |
| commit | e527e49c38c9d54aadf7bdeaba68e89012b963cb (patch) | |
| tree | d26ff2e7b035a898b394209aeabaa68819f7f5b3 | |
| parent | 1332bbd6165b36860013c98483ecd1f8cb4c310d (diff) | |
| download | org-mode-e527e49c38c9d54aadf7bdeaba68e89012b963cb.tar.gz | |
ob-python: Honor the :python header argument in python src blocks
* lisp/ob-python.el (org-babel-execute:python):
`org-babel-python-command` should be set before calling
`org-babel-python-initiate-session`.
TINYCHANGE
| -rw-r--r-- | lisp/ob-python.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/ob-python.el b/lisp/ob-python.el index b838a48..302f8bd 100644 --- a/lisp/ob-python.el +++ b/lisp/ob-python.el @@ -73,15 +73,16 @@ This will typically be either `python' or `python-mode'." (defun org-babel-execute:python (body params) "Execute a block of Python code with Babel. This function is called by `org-babel-execute-src-block'." - (let* ((session (org-babel-python-initiate-session + (let* ((org-babel-python-command + (or (cdr (assq :python params)) + org-babel-python-command)) + (session (org-babel-python-initiate-session (cdr (assq :session params)))) (result-params (cdr (assq :result-params params))) (result-type (cdr (assq :result-type params))) (return-val (when (and (eq result-type 'value) (not session)) (cdr (assq :return params)))) (preamble (cdr (assq :preamble params))) - (org-babel-python-command - (or (cdr (assq :python params)) org-babel-python-command)) (full-body (org-babel-expand-body:generic (concat body (if return-val (format "\nreturn %s" return-val) "")) |