forked from mirrors/org-mode
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
This commit is contained in:
parent
1332bbd616
commit
e527e49c38
|
@ -73,15 +73,16 @@ This will typically be either `python' or `python-mode'."
|
||||||
(defun org-babel-execute:python (body params)
|
(defun org-babel-execute:python (body params)
|
||||||
"Execute a block of Python code with Babel.
|
"Execute a block of Python code with Babel.
|
||||||
This function is called by `org-babel-execute-src-block'."
|
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))))
|
(cdr (assq :session params))))
|
||||||
(result-params (cdr (assq :result-params params)))
|
(result-params (cdr (assq :result-params params)))
|
||||||
(result-type (cdr (assq :result-type params)))
|
(result-type (cdr (assq :result-type params)))
|
||||||
(return-val (when (and (eq result-type 'value) (not session))
|
(return-val (when (and (eq result-type 'value) (not session))
|
||||||
(cdr (assq :return params))))
|
(cdr (assq :return params))))
|
||||||
(preamble (cdr (assq :preamble params)))
|
(preamble (cdr (assq :preamble params)))
|
||||||
(org-babel-python-command
|
|
||||||
(or (cdr (assq :python params)) org-babel-python-command))
|
|
||||||
(full-body
|
(full-body
|
||||||
(org-babel-expand-body:generic
|
(org-babel-expand-body:generic
|
||||||
(concat body (if return-val (format "\nreturn %s" return-val) ""))
|
(concat body (if return-val (format "\nreturn %s" return-val) ""))
|
||||||
|
|
Loading…
Reference in a new issue