2010-06-11 19:02:42 -04:00
|
|
|
;;; ob-python.el --- org-babel functions for python evaluation
|
2009-06-12 11:46:00 -04:00
|
|
|
|
2012-01-05 03:43:21 -05:00
|
|
|
;; Copyright (C) 2009-2012 Free Software Foundation, Inc.
|
2009-06-12 11:46:00 -04:00
|
|
|
|
2012-04-01 18:53:28 -04:00
|
|
|
;; Authors: Eric Schulte
|
|
|
|
;; Dan Davison
|
2009-06-12 11:46:00 -04:00
|
|
|
;; Keywords: literate programming, reproducible research
|
|
|
|
;; Homepage: http://orgmode.org
|
|
|
|
|
2010-06-25 12:32:35 -04:00
|
|
|
;; This file is part of GNU Emacs.
|
2009-06-12 11:46:00 -04:00
|
|
|
|
2010-06-25 12:32:35 -04:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2009-06-12 11:46:00 -04:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2010-06-25 12:32:35 -04:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
2009-06-12 11:46:00 -04:00
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
2010-06-25 12:32:35 -04:00
|
|
|
|
2009-06-12 11:46:00 -04:00
|
|
|
;; You should have received a copy of the GNU General Public License
|
2010-06-25 12:32:35 -04:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2009-06-12 11:46:00 -04:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;; Org-Babel support for evaluating python source code.
|
|
|
|
|
|
|
|
;;; Code:
|
2010-06-11 19:02:42 -04:00
|
|
|
(require 'ob)
|
2010-07-02 22:21:31 -04:00
|
|
|
(require 'ob-ref)
|
2010-06-11 19:02:42 -04:00
|
|
|
(require 'ob-comint)
|
2010-07-04 17:46:13 -04:00
|
|
|
(require 'ob-eval)
|
2010-07-02 22:21:31 -04:00
|
|
|
(eval-when-compile (require 'cl))
|
|
|
|
|
|
|
|
(declare-function org-remove-indentation "org" )
|
2010-07-09 13:58:12 -04:00
|
|
|
(declare-function py-shell "ext:python-mode" (&optional argprompt))
|
2010-12-13 20:45:26 -05:00
|
|
|
(declare-function py-toggle-shells "ext:python-mode" (arg))
|
2010-07-09 13:58:12 -04:00
|
|
|
(declare-function run-python "ext:python" (&optional cmd noshow new))
|
2009-06-12 11:46:00 -04:00
|
|
|
|
2011-06-21 18:34:41 -04:00
|
|
|
(defvar org-babel-tangle-lang-exts)
|
2010-06-17 13:21:14 -04:00
|
|
|
(add-to-list 'org-babel-tangle-lang-exts '("python" . "py"))
|
|
|
|
|
2010-06-25 13:12:54 -04:00
|
|
|
(defvar org-babel-default-header-args:python '())
|
|
|
|
|
2010-07-04 12:48:12 -04:00
|
|
|
(defvar org-babel-python-command "python"
|
2012-09-28 11:47:48 -04:00
|
|
|
"Name of command for executing Python code.")
|
2010-07-04 12:48:12 -04:00
|
|
|
|
2010-07-09 13:58:12 -04:00
|
|
|
(defvar org-babel-python-mode (if (featurep 'xemacs) 'python-mode 'python)
|
2011-01-20 10:05:22 -05:00
|
|
|
"Preferred python mode for use in running python interactively.
|
|
|
|
This will typically be either 'python or 'python-mode.")
|
2010-07-09 13:58:12 -04:00
|
|
|
|
2010-10-13 00:59:24 -04:00
|
|
|
(defvar org-src-preserve-indentation)
|
2010-04-16 01:14:10 -04:00
|
|
|
|
2012-10-30 20:04:41 -04:00
|
|
|
(defcustom org-babel-python-hline-to "None"
|
|
|
|
"Replace hlines in incoming tables with this when translating to python.")
|
|
|
|
|
|
|
|
(defcustom org-babel-python-None-to 'hline
|
|
|
|
"Replace 'None' in python tables with this before returning.")
|
|
|
|
|
2009-07-08 00:13:07 -04:00
|
|
|
(defun org-babel-execute:python (body params)
|
2010-07-13 19:20:08 -04:00
|
|
|
"Execute a block of Python code with Babel.
|
|
|
|
This function is called by `org-babel-execute-src-block'."
|
2010-10-21 07:52:24 -04:00
|
|
|
(let* ((session (org-babel-python-initiate-session
|
|
|
|
(cdr (assoc :session params))))
|
|
|
|
(result-params (cdr (assoc :result-params params)))
|
|
|
|
(result-type (cdr (assoc :result-type params)))
|
2010-11-27 18:59:51 -05:00
|
|
|
(return-val (when (and (eq result-type 'value) (not session))
|
|
|
|
(cdr (assoc :return params))))
|
2010-12-03 09:29:28 -05:00
|
|
|
(preamble (cdr (assoc :preamble params)))
|
2010-10-21 07:28:19 -04:00
|
|
|
(full-body
|
|
|
|
(org-babel-expand-body:generic
|
2012-04-23 11:39:28 -04:00
|
|
|
(concat body (if return-val (format "\nreturn %s" return-val) ""))
|
2010-11-27 18:59:51 -05:00
|
|
|
params (org-babel-variable-assignments:python params)))
|
2010-07-02 22:21:31 -04:00
|
|
|
(result (org-babel-python-evaluate
|
2010-12-03 09:29:28 -05:00
|
|
|
session full-body result-type result-params preamble)))
|
2010-12-21 05:21:28 -05:00
|
|
|
(org-babel-reassemble-table
|
|
|
|
result
|
|
|
|
(org-babel-pick-name (cdr (assoc :colname-names params))
|
|
|
|
(cdr (assoc :colnames params)))
|
|
|
|
(org-babel-pick-name (cdr (assoc :rowname-names params))
|
|
|
|
(cdr (assoc :rownames params))))))
|
2009-06-12 11:46:00 -04:00
|
|
|
|
2009-06-14 14:34:06 -04:00
|
|
|
(defun org-babel-prep-session:python (session params)
|
2010-10-21 07:28:19 -04:00
|
|
|
"Prepare SESSION according to the header arguments in PARAMS.
|
|
|
|
VARS contains resolved variable references"
|
2009-06-14 14:34:06 -04:00
|
|
|
(let* ((session (org-babel-python-initiate-session session))
|
2010-10-21 07:28:19 -04:00
|
|
|
(var-lines
|
|
|
|
(org-babel-variable-assignments:python params)))
|
2009-06-14 14:34:06 -04:00
|
|
|
(org-babel-comint-in-buffer session
|
|
|
|
(mapc (lambda (var)
|
Xemacs incompatibilities
Carsten Dominik <carsten.dominik@gmail.com> writes:
> On May 17, 2010, at 4:39 PM, Michael Sperber wrote:
>
>> In particular, fixing the require won't be enough: org-babel-python.el
>> uses `run-python' and interacts with the inferior Python, whereas
>> python-mode.el defines `py-shell'.
>>
>> Should I try to abstract over the differences?
>
> Yes, this would be much appreciated. (I think, Eric or Dan?)
OK, I've attached a patch that makes `org-babel-python' work on XEmacs.
Most of the issues are pure XEmacs issues. Notes:
- XEmacs doesn't have [[:digit:]] - I hope to rectify this in the
future, but it seems there's no downside in this particular case to
replacing by [0-9].
- XEmacs doesn't have `move-end-of-line', but does have `end-of-line'.
I don't understand the intent of having both of these, but the code
seems fine with `end-of-line'.
- It seems there are way too few `require's throughout org-babel. I
don't know if it's OK to add the ones I needed.
- `org-babel-python-evaluate' looked broken as-is: It doesn't use the
`body' argument properly, the result is (I think) processed in the
wrong order and not properly split into lines. I've fixed all these,
but a review is probably in order.
2010-05-24 15:22:50 -04:00
|
|
|
(end-of-line 1) (insert var) (comint-send-input)
|
2010-01-11 12:14:30 -05:00
|
|
|
(org-babel-comint-wait-for-output session)) var-lines))
|
|
|
|
session))
|
|
|
|
|
|
|
|
(defun org-babel-load-session:python (session body params)
|
|
|
|
"Load BODY into SESSION."
|
|
|
|
(save-window-excursion
|
|
|
|
(let ((buffer (org-babel-prep-session:python session params)))
|
|
|
|
(with-current-buffer buffer
|
|
|
|
(goto-char (process-mark (get-buffer-process (current-buffer))))
|
|
|
|
(insert (org-babel-chomp body)))
|
|
|
|
buffer)))
|
2009-06-14 14:34:06 -04:00
|
|
|
|
|
|
|
;; helper functions
|
|
|
|
|
2010-10-21 07:28:19 -04:00
|
|
|
(defun org-babel-variable-assignments:python (params)
|
2012-09-28 11:47:48 -04:00
|
|
|
"Return a list of Python statements assigning the block's variables."
|
2010-10-14 16:05:02 -04:00
|
|
|
(mapcar
|
|
|
|
(lambda (pair)
|
|
|
|
(format "%s=%s"
|
|
|
|
(car pair)
|
|
|
|
(org-babel-python-var-to-python (cdr pair))))
|
2010-10-15 23:35:45 -04:00
|
|
|
(mapcar #'cdr (org-babel-get-header params :var))))
|
2010-10-14 16:05:02 -04:00
|
|
|
|
2009-06-12 11:46:00 -04:00
|
|
|
(defun org-babel-python-var-to-python (var)
|
2010-07-13 19:20:08 -04:00
|
|
|
"Convert an elisp value to a python variable.
|
|
|
|
Convert an elisp value, VAR, into a string of python source code
|
|
|
|
specifying a variable of the same value."
|
2009-06-12 11:46:00 -04:00
|
|
|
(if (listp var)
|
|
|
|
(concat "[" (mapconcat #'org-babel-python-var-to-python var ", ") "]")
|
2010-07-14 14:31:38 -04:00
|
|
|
(if (equal var 'hline)
|
2012-10-30 20:04:41 -04:00
|
|
|
org-babel-python-hline-to
|
2010-07-14 14:31:38 -04:00
|
|
|
(format
|
|
|
|
(if (and (stringp var) (string-match "[\n\r]" var)) "\"\"%S\"\"" "%S")
|
|
|
|
var))))
|
2009-06-12 11:46:00 -04:00
|
|
|
|
2009-07-05 19:55:54 -04:00
|
|
|
(defun org-babel-python-table-or-string (results)
|
2010-07-13 19:20:08 -04:00
|
|
|
"Convert RESULTS into an appropriate elisp value.
|
|
|
|
If the results look like a list or tuple, then convert them into an
|
2009-06-12 11:46:00 -04:00
|
|
|
Emacs-lisp table, otherwise return the results as a string."
|
2012-10-30 20:04:41 -04:00
|
|
|
((lambda (res)
|
|
|
|
(if (listp res)
|
|
|
|
(mapcar (lambda (el) (if (equal el 'None)
|
|
|
|
org-babel-python-None-to el))
|
|
|
|
res)
|
|
|
|
res))
|
|
|
|
(org-babel-script-escape results)))
|
2009-06-12 11:46:00 -04:00
|
|
|
|
2010-07-01 18:09:34 -04:00
|
|
|
(defvar org-babel-python-buffers '((:default . nil)))
|
2009-06-12 17:48:40 -04:00
|
|
|
|
|
|
|
(defun org-babel-python-session-buffer (session)
|
2010-06-11 20:12:15 -04:00
|
|
|
"Return the buffer associated with SESSION."
|
2009-06-12 17:48:40 -04:00
|
|
|
(cdr (assoc session org-babel-python-buffers)))
|
|
|
|
|
2011-03-01 02:08:36 -05:00
|
|
|
(defvar py-default-interpreter)
|
2009-06-14 14:34:06 -04:00
|
|
|
(defun org-babel-python-initiate-session-by-key (&optional session)
|
2010-07-13 19:20:08 -04:00
|
|
|
"Initiate a python session.
|
|
|
|
If there is not a current inferior-process-buffer in SESSION
|
2009-06-12 11:46:00 -04:00
|
|
|
then create. Return the initialized session."
|
2010-07-09 13:58:12 -04:00
|
|
|
(require org-babel-python-mode)
|
2009-06-12 17:48:40 -04:00
|
|
|
(save-window-excursion
|
|
|
|
(let* ((session (if session (intern session) :default))
|
|
|
|
(python-buffer (org-babel-python-session-buffer session)))
|
Xemacs incompatibilities
Carsten Dominik <carsten.dominik@gmail.com> writes:
> On May 17, 2010, at 4:39 PM, Michael Sperber wrote:
>
>> In particular, fixing the require won't be enough: org-babel-python.el
>> uses `run-python' and interacts with the inferior Python, whereas
>> python-mode.el defines `py-shell'.
>>
>> Should I try to abstract over the differences?
>
> Yes, this would be much appreciated. (I think, Eric or Dan?)
OK, I've attached a patch that makes `org-babel-python' work on XEmacs.
Most of the issues are pure XEmacs issues. Notes:
- XEmacs doesn't have [[:digit:]] - I hope to rectify this in the
future, but it seems there's no downside in this particular case to
replacing by [0-9].
- XEmacs doesn't have `move-end-of-line', but does have `end-of-line'.
I don't understand the intent of having both of these, but the code
seems fine with `end-of-line'.
- It seems there are way too few `require's throughout org-babel. I
don't know if it's OK to add the ones I needed.
- `org-babel-python-evaluate' looked broken as-is: It doesn't use the
`body' argument properly, the result is (I think) processed in the
wrong order and not properly split into lines. I've fixed all these,
but a review is probably in order.
2010-05-24 15:22:50 -04:00
|
|
|
(cond
|
2010-08-16 11:08:37 -04:00
|
|
|
((and (eq 'python org-babel-python-mode)
|
2010-07-09 13:58:12 -04:00
|
|
|
(fboundp 'run-python)) ; python.el
|
Xemacs incompatibilities
Carsten Dominik <carsten.dominik@gmail.com> writes:
> On May 17, 2010, at 4:39 PM, Michael Sperber wrote:
>
>> In particular, fixing the require won't be enough: org-babel-python.el
>> uses `run-python' and interacts with the inferior Python, whereas
>> python-mode.el defines `py-shell'.
>>
>> Should I try to abstract over the differences?
>
> Yes, this would be much appreciated. (I think, Eric or Dan?)
OK, I've attached a patch that makes `org-babel-python' work on XEmacs.
Most of the issues are pure XEmacs issues. Notes:
- XEmacs doesn't have [[:digit:]] - I hope to rectify this in the
future, but it seems there's no downside in this particular case to
replacing by [0-9].
- XEmacs doesn't have `move-end-of-line', but does have `end-of-line'.
I don't understand the intent of having both of these, but the code
seems fine with `end-of-line'.
- It seems there are way too few `require's throughout org-babel. I
don't know if it's OK to add the ones I needed.
- `org-babel-python-evaluate' looked broken as-is: It doesn't use the
`body' argument properly, the result is (I think) processed in the
wrong order and not properly split into lines. I've fixed all these,
but a review is probably in order.
2010-05-24 15:22:50 -04:00
|
|
|
(run-python))
|
2010-08-16 11:08:37 -04:00
|
|
|
((and (eq 'python-mode org-babel-python-mode)
|
2010-07-09 13:58:12 -04:00
|
|
|
(fboundp 'py-shell)) ; python-mode.el
|
2010-12-13 20:45:26 -05:00
|
|
|
;; Make sure that py-which-bufname is initialized, as otherwise
|
|
|
|
;; it will be overwritten the first time a Python buffer is
|
|
|
|
;; created.
|
2011-01-14 16:53:28 -05:00
|
|
|
(py-toggle-shells py-default-interpreter)
|
Xemacs incompatibilities
Carsten Dominik <carsten.dominik@gmail.com> writes:
> On May 17, 2010, at 4:39 PM, Michael Sperber wrote:
>
>> In particular, fixing the require won't be enough: org-babel-python.el
>> uses `run-python' and interacts with the inferior Python, whereas
>> python-mode.el defines `py-shell'.
>>
>> Should I try to abstract over the differences?
>
> Yes, this would be much appreciated. (I think, Eric or Dan?)
OK, I've attached a patch that makes `org-babel-python' work on XEmacs.
Most of the issues are pure XEmacs issues. Notes:
- XEmacs doesn't have [[:digit:]] - I hope to rectify this in the
future, but it seems there's no downside in this particular case to
replacing by [0-9].
- XEmacs doesn't have `move-end-of-line', but does have `end-of-line'.
I don't understand the intent of having both of these, but the code
seems fine with `end-of-line'.
- It seems there are way too few `require's throughout org-babel. I
don't know if it's OK to add the ones I needed.
- `org-babel-python-evaluate' looked broken as-is: It doesn't use the
`body' argument properly, the result is (I think) processed in the
wrong order and not properly split into lines. I've fixed all these,
but a review is probably in order.
2010-05-24 15:22:50 -04:00
|
|
|
;; `py-shell' creates a buffer whose name is the value of
|
|
|
|
;; `py-which-bufname' with '*'s at the beginning and end
|
2011-01-14 16:53:28 -05:00
|
|
|
(let* ((bufname (if (and python-buffer (buffer-live-p python-buffer))
|
2010-07-04 12:48:12 -04:00
|
|
|
(replace-regexp-in-string ;; zap surrounding *
|
|
|
|
"^\\*\\([^*]+\\)\\*$" "\\1" python-buffer)
|
Xemacs incompatibilities
Carsten Dominik <carsten.dominik@gmail.com> writes:
> On May 17, 2010, at 4:39 PM, Michael Sperber wrote:
>
>> In particular, fixing the require won't be enough: org-babel-python.el
>> uses `run-python' and interacts with the inferior Python, whereas
>> python-mode.el defines `py-shell'.
>>
>> Should I try to abstract over the differences?
>
> Yes, this would be much appreciated. (I think, Eric or Dan?)
OK, I've attached a patch that makes `org-babel-python' work on XEmacs.
Most of the issues are pure XEmacs issues. Notes:
- XEmacs doesn't have [[:digit:]] - I hope to rectify this in the
future, but it seems there's no downside in this particular case to
replacing by [0-9].
- XEmacs doesn't have `move-end-of-line', but does have `end-of-line'.
I don't understand the intent of having both of these, but the code
seems fine with `end-of-line'.
- It seems there are way too few `require's throughout org-babel. I
don't know if it's OK to add the ones I needed.
- `org-babel-python-evaluate' looked broken as-is: It doesn't use the
`body' argument properly, the result is (I think) processed in the
wrong order and not properly split into lines. I've fixed all these,
but a review is probably in order.
2010-05-24 15:22:50 -04:00
|
|
|
(concat "Python-" (symbol-name session))))
|
2010-07-04 12:48:12 -04:00
|
|
|
(py-which-bufname bufname))
|
Xemacs incompatibilities
Carsten Dominik <carsten.dominik@gmail.com> writes:
> On May 17, 2010, at 4:39 PM, Michael Sperber wrote:
>
>> In particular, fixing the require won't be enough: org-babel-python.el
>> uses `run-python' and interacts with the inferior Python, whereas
>> python-mode.el defines `py-shell'.
>>
>> Should I try to abstract over the differences?
>
> Yes, this would be much appreciated. (I think, Eric or Dan?)
OK, I've attached a patch that makes `org-babel-python' work on XEmacs.
Most of the issues are pure XEmacs issues. Notes:
- XEmacs doesn't have [[:digit:]] - I hope to rectify this in the
future, but it seems there's no downside in this particular case to
replacing by [0-9].
- XEmacs doesn't have `move-end-of-line', but does have `end-of-line'.
I don't understand the intent of having both of these, but the code
seems fine with `end-of-line'.
- It seems there are way too few `require's throughout org-babel. I
don't know if it's OK to add the ones I needed.
- `org-babel-python-evaluate' looked broken as-is: It doesn't use the
`body' argument properly, the result is (I think) processed in the
wrong order and not properly split into lines. I've fixed all these,
but a review is probably in order.
2010-05-24 15:22:50 -04:00
|
|
|
(py-shell)
|
|
|
|
(setq python-buffer (concat "*" bufname "*"))))
|
|
|
|
(t
|
2012-09-28 11:47:48 -04:00
|
|
|
(error "No function available for running an inferior Python")))
|
2010-07-04 12:48:12 -04:00
|
|
|
(setq org-babel-python-buffers
|
|
|
|
(cons (cons session python-buffer)
|
|
|
|
(assq-delete-all session org-babel-python-buffers)))
|
2009-06-12 17:48:40 -04:00
|
|
|
session)))
|
2009-06-12 11:46:00 -04:00
|
|
|
|
2010-03-13 12:59:41 -05:00
|
|
|
(defun org-babel-python-initiate-session (&optional session params)
|
2010-06-11 20:12:15 -04:00
|
|
|
"Create a session named SESSION according to PARAMS."
|
2009-06-15 14:14:32 -04:00
|
|
|
(unless (string= session "none")
|
2010-07-04 12:48:12 -04:00
|
|
|
(org-babel-python-session-buffer
|
|
|
|
(org-babel-python-initiate-session-by-key session))))
|
|
|
|
|
2009-06-12 11:46:00 -04:00
|
|
|
(defvar org-babel-python-eoe-indicator "'org_babel_python_eoe'"
|
2010-07-13 19:20:08 -04:00
|
|
|
"A string to indicate that evaluation has completed.")
|
2009-06-15 14:14:32 -04:00
|
|
|
(defvar org-babel-python-wrapper-method
|
|
|
|
"
|
|
|
|
def main():
|
|
|
|
%s
|
|
|
|
|
|
|
|
open('%s', 'w').write( str(main()) )")
|
2009-10-18 15:14:39 -04:00
|
|
|
(defvar org-babel-python-pp-wrapper-method
|
|
|
|
"
|
|
|
|
import pprint
|
|
|
|
def main():
|
|
|
|
%s
|
|
|
|
|
|
|
|
open('%s', 'w').write( pprint.pformat(main()) )")
|
2009-06-12 11:46:00 -04:00
|
|
|
|
2010-07-02 22:21:31 -04:00
|
|
|
(defun org-babel-python-evaluate
|
2010-12-03 09:29:28 -05:00
|
|
|
(session body &optional result-type result-params preamble)
|
2012-09-28 11:47:48 -04:00
|
|
|
"Evaluate BODY as Python code."
|
2010-09-07 21:58:58 -04:00
|
|
|
(if session
|
|
|
|
(org-babel-python-evaluate-session
|
|
|
|
session body result-type result-params)
|
|
|
|
(org-babel-python-evaluate-external-process
|
2010-12-03 09:29:28 -05:00
|
|
|
body result-type result-params preamble)))
|
2010-09-07 21:58:58 -04:00
|
|
|
|
|
|
|
(defun org-babel-python-evaluate-external-process
|
2010-12-03 09:29:28 -05:00
|
|
|
(body &optional result-type result-params preamble)
|
2010-09-07 21:58:58 -04:00
|
|
|
"Evaluate BODY in external python process.
|
|
|
|
If RESULT-TYPE equals 'output then return standard output as a
|
2012-08-11 13:10:44 -04:00
|
|
|
string. If RESULT-TYPE equals 'value then return the value of the
|
2010-09-07 21:58:58 -04:00
|
|
|
last statement in BODY, as elisp."
|
2011-04-14 22:24:10 -04:00
|
|
|
((lambda (raw)
|
|
|
|
(if (or (member "code" result-params)
|
|
|
|
(member "pp" result-params)
|
|
|
|
(and (member "output" result-params)
|
|
|
|
(not (member "table" result-params))))
|
|
|
|
raw
|
|
|
|
(org-babel-python-table-or-string (org-babel-trim raw))))
|
|
|
|
(case result-type
|
|
|
|
(output (org-babel-eval org-babel-python-command
|
|
|
|
(concat (if preamble (concat preamble "\n") "")
|
|
|
|
body)))
|
|
|
|
(value (let ((tmp-file (org-babel-temp-file "python-")))
|
|
|
|
(org-babel-eval
|
|
|
|
org-babel-python-command
|
|
|
|
(concat
|
|
|
|
(if preamble (concat preamble "\n") "")
|
|
|
|
(format
|
|
|
|
(if (member "pp" result-params)
|
|
|
|
org-babel-python-pp-wrapper-method
|
|
|
|
org-babel-python-wrapper-method)
|
|
|
|
(mapconcat
|
|
|
|
(lambda (line) (format "\t%s" line))
|
|
|
|
(split-string
|
|
|
|
(org-remove-indentation
|
|
|
|
(org-babel-trim body))
|
|
|
|
"[\r\n]") "\n")
|
|
|
|
(org-babel-process-file-name tmp-file 'noquote))))
|
2010-09-07 21:58:58 -04:00
|
|
|
(org-babel-eval-read-file tmp-file))))))
|
|
|
|
|
|
|
|
(defun org-babel-python-evaluate-session
|
|
|
|
(session body &optional result-type result-params)
|
|
|
|
"Pass BODY to the Python process in SESSION.
|
|
|
|
If RESULT-TYPE equals 'output then return standard output as a
|
2012-08-11 13:10:44 -04:00
|
|
|
string. If RESULT-TYPE equals 'value then return the value of the
|
2010-09-07 21:58:58 -04:00
|
|
|
last statement in BODY, as elisp."
|
2012-08-09 10:13:18 -04:00
|
|
|
(let* ((send-wait (lambda () (comint-send-input nil t) (sleep-for 0 5)))
|
2011-07-03 11:10:43 -04:00
|
|
|
(dump-last-value
|
2012-08-09 10:13:18 -04:00
|
|
|
(lambda
|
|
|
|
(tmp-file pp)
|
|
|
|
(mapc
|
|
|
|
(lambda (statement) (insert statement) (funcall send-wait))
|
|
|
|
(if pp
|
|
|
|
(list
|
|
|
|
"import pprint"
|
|
|
|
(format "open('%s', 'w').write(pprint.pformat(_))"
|
|
|
|
(org-babel-process-file-name tmp-file 'noquote)))
|
|
|
|
(list (format "open('%s', 'w').write(str(_))"
|
|
|
|
(org-babel-process-file-name tmp-file 'noquote)))))))
|
|
|
|
(input-body (lambda (body)
|
|
|
|
(mapc (lambda (line) (insert line) (funcall send-wait))
|
|
|
|
(split-string body "[\r\n]"))
|
|
|
|
(funcall send-wait))))
|
2011-04-14 22:24:10 -04:00
|
|
|
((lambda (results)
|
2011-07-03 14:12:11 -04:00
|
|
|
(unless (string= (substring org-babel-python-eoe-indicator 1 -1) results)
|
|
|
|
(if (or (member "code" result-params)
|
|
|
|
(member "pp" result-params)
|
|
|
|
(and (member "output" result-params)
|
|
|
|
(not (member "table" result-params))))
|
|
|
|
results
|
|
|
|
(org-babel-python-table-or-string results))))
|
2011-04-14 22:24:10 -04:00
|
|
|
(case result-type
|
|
|
|
(output
|
|
|
|
(mapconcat
|
|
|
|
#'org-babel-trim
|
|
|
|
(butlast
|
|
|
|
(org-babel-comint-with-output
|
|
|
|
(session org-babel-python-eoe-indicator t body)
|
2012-08-09 10:13:18 -04:00
|
|
|
(funcall input-body body)
|
|
|
|
(funcall send-wait) (funcall send-wait)
|
2011-07-03 11:10:43 -04:00
|
|
|
(insert org-babel-python-eoe-indicator)
|
2012-08-09 10:13:18 -04:00
|
|
|
(funcall send-wait))
|
2011-06-20 15:18:09 -04:00
|
|
|
2) "\n"))
|
2011-04-14 22:24:10 -04:00
|
|
|
(value
|
2010-09-22 16:52:48 -04:00
|
|
|
(let ((tmp-file (org-babel-temp-file "python-")))
|
2010-09-07 21:58:58 -04:00
|
|
|
(org-babel-comint-with-output
|
2011-02-06 10:03:02 -05:00
|
|
|
(session org-babel-python-eoe-indicator nil body)
|
2010-09-07 21:58:58 -04:00
|
|
|
(let ((comint-process-echoes nil))
|
2012-08-09 10:13:18 -04:00
|
|
|
(funcall input-body body)
|
|
|
|
(funcall dump-last-value tmp-file (member "pp" result-params))
|
|
|
|
(funcall send-wait) (funcall send-wait)
|
2010-09-07 21:58:58 -04:00
|
|
|
(insert org-babel-python-eoe-indicator)
|
2012-08-09 10:13:18 -04:00
|
|
|
(funcall send-wait)))
|
2010-09-07 21:58:58 -04:00
|
|
|
(org-babel-eval-read-file tmp-file)))))))
|
2009-06-12 11:46:00 -04:00
|
|
|
|
2009-06-12 19:23:28 -04:00
|
|
|
(defun org-babel-python-read-string (string)
|
2012-09-28 11:47:48 -04:00
|
|
|
"Strip 's from around Python string."
|
2010-02-19 11:34:16 -05:00
|
|
|
(if (string-match "^'\\([^\000]+\\)'$" string)
|
2009-06-12 19:23:28 -04:00
|
|
|
(match-string 1 string)
|
|
|
|
string))
|
|
|
|
|
2010-06-11 19:02:42 -04:00
|
|
|
(provide 'ob-python)
|
2010-06-25 12:32:35 -04:00
|
|
|
|
2011-08-15 14:04:38 -04:00
|
|
|
|
2010-06-25 12:32:35 -04:00
|
|
|
|
2010-06-11 19:02:42 -04:00
|
|
|
;;; ob-python.el ends here
|