2015-10-25 20:56:00 -04:00
|
|
|
;;; ob-python.el --- Babel Functions for Python -*- lexical-binding: t; -*-
|
2009-06-12 11:46:00 -04:00
|
|
|
|
2023-01-01 05:31:12 -05:00
|
|
|
;; Copyright (C) 2009-2023 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
|
2020-09-04 20:59:18 -04:00
|
|
|
;; Maintainer: Jack Kamm <jackkamm@gmail.com>
|
2009-06-12 11:46:00 -04:00
|
|
|
;; Keywords: literate programming, reproducible research
|
2021-09-26 03:44:29 -04:00
|
|
|
;; URL: https://orgmode.org
|
2009-06-12 11:46:00 -04:00
|
|
|
|
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
|
2017-09-13 18:52:52 -04:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2009-06-12 11:46:00 -04:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;; Org-Babel support for evaluating python source code.
|
|
|
|
|
|
|
|
;;; Code:
|
2022-08-04 09:53:05 -04:00
|
|
|
|
|
|
|
(require 'org-macs)
|
|
|
|
(org-assert-version)
|
|
|
|
|
2010-06-11 19:02:42 -04:00
|
|
|
(require 'ob)
|
2018-05-09 20:04:12 -04:00
|
|
|
(require 'org-macs)
|
2020-08-24 23:17:57 -04:00
|
|
|
(require 'python)
|
2010-07-02 22:21:31 -04:00
|
|
|
|
2020-02-18 07:52:32 -05:00
|
|
|
(declare-function py-shell "ext:python-mode" (&rest args))
|
2022-10-26 00:38:58 -04:00
|
|
|
(declare-function py-choose-shell "ext:python-mode" (&optional shell))
|
2020-09-06 20:45:08 -04:00
|
|
|
(declare-function py-shell-send-string "ext:python-mode" (strg &optional process))
|
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 '())
|
|
|
|
|
2013-02-23 04:27:55 -05:00
|
|
|
(defcustom org-babel-python-command "python"
|
|
|
|
"Name of the command for executing Python code."
|
2013-02-26 12:21:28 -05:00
|
|
|
:version "24.4"
|
|
|
|
:package-version '(Org . "8.0")
|
2013-02-23 04:27:55 -05:00
|
|
|
:group 'org-babel
|
|
|
|
:type 'string)
|
2010-07-04 12:48:12 -04:00
|
|
|
|
2013-11-15 00:22:36 -05:00
|
|
|
(defcustom org-babel-python-mode
|
2016-05-26 05:30:11 -04:00
|
|
|
(if (featurep 'python-mode) 'python-mode 'python)
|
2011-01-20 10:05:22 -05:00
|
|
|
"Preferred python mode for use in running python interactively.
|
2015-09-21 00:24:12 -04:00
|
|
|
This will typically be either `python' or `python-mode'."
|
2013-02-23 04:27:55 -05:00
|
|
|
:group 'org-babel
|
2013-02-26 12:21:28 -05:00
|
|
|
:version "24.4"
|
|
|
|
:package-version '(Org . "8.0")
|
2013-11-14 08:05:18 -05:00
|
|
|
:type 'symbol)
|
2010-07-09 13:58:12 -04:00
|
|
|
|
2012-10-30 20:04:41 -04:00
|
|
|
(defcustom org-babel-python-hline-to "None"
|
2012-12-07 15:05:52 -05:00
|
|
|
"Replace hlines in incoming tables with this when translating to python."
|
|
|
|
:group 'org-babel
|
Add :version and :package-version
* ox.el (org-export-snippet-translation-alist)
(org-export-coding-system, org-export-in-background)
(org-export-async-init-file, org-export-invisible-backends)
(org-export-dispatch-use-expert-ui):
* ox-texinfo.el (org-texinfo-filename, org-texinfo-classes)
(org-texinfo-format-headline-function)
(org-texinfo-node-description-column)
(org-texinfo-active-timestamp-format)
(org-texinfo-link-with-unknown-path-format)
(org-texinfo-tables-verbatim)
(org-texinfo-table-scientific-notation)
(org-texinfo-text-markup-alist)
(org-texinfo-format-drawer-function)
(org-texinfo-format-inlinetask-function)
(org-texinfo-info-process):
* ox-man.el (org-man-tables-centered)
(org-man-table-scientific-notation)
(org-man-source-highlight, org-man-source-highlight-langs)
(org-man-pdf-process, org-man-logfiles-extensions):
* ox-html.el (org-html-allow-name-attribute-in-anchors)
(org-html-coding-system, org-html-divs):
* ox-ascii.el (org-ascii-text-width)
(org-ascii-headline-spacing, org-ascii-indented-line-width)
(org-ascii-paragraph-spacing, org-ascii-charset)
(org-ascii-underline, org-ascii-bullets)
(org-ascii-links-to-notes)
(org-ascii-table-keep-all-vertical-lines)
(org-ascii-table-widen-columns)
(org-ascii-table-use-ascii-art)
(org-ascii-format-drawer-function)
(org-ascii-format-inlinetask-function):
* org.el (org-modules, org-export-backends)
(org-highlight-latex-and-related, orgstruct-setup-hook):
* org-attach.el (org-attach-git-annex-cutoff):
* org-archive.el (org-archive-file-header-format):
* org-agenda.el (org-agenda-todo-ignore-time-comparison-use-seconds):
* ob-python.el (org-babel-python-hline-to)
(org-babel-python-None-to):
* ob-ditaa.el (org-ditaa-eps-jar-path):
* ob-core.el (org-babel-results-keyword): Add :version and
:package-version.
* ox-ascii.el: Use utf-8-emacs as the file coding system.
2013-03-05 10:34:16 -05:00
|
|
|
:version "24.4"
|
|
|
|
:package-version '(Org . "8.0")
|
2012-12-07 15:05:52 -05:00
|
|
|
:type 'string)
|
2012-10-30 20:04:41 -04:00
|
|
|
|
|
|
|
(defcustom org-babel-python-None-to 'hline
|
2015-09-21 00:23:36 -04:00
|
|
|
"Replace `None' in python tables with this before returning."
|
2012-12-07 15:05:52 -05:00
|
|
|
:group 'org-babel
|
Add :version and :package-version
* ox.el (org-export-snippet-translation-alist)
(org-export-coding-system, org-export-in-background)
(org-export-async-init-file, org-export-invisible-backends)
(org-export-dispatch-use-expert-ui):
* ox-texinfo.el (org-texinfo-filename, org-texinfo-classes)
(org-texinfo-format-headline-function)
(org-texinfo-node-description-column)
(org-texinfo-active-timestamp-format)
(org-texinfo-link-with-unknown-path-format)
(org-texinfo-tables-verbatim)
(org-texinfo-table-scientific-notation)
(org-texinfo-text-markup-alist)
(org-texinfo-format-drawer-function)
(org-texinfo-format-inlinetask-function)
(org-texinfo-info-process):
* ox-man.el (org-man-tables-centered)
(org-man-table-scientific-notation)
(org-man-source-highlight, org-man-source-highlight-langs)
(org-man-pdf-process, org-man-logfiles-extensions):
* ox-html.el (org-html-allow-name-attribute-in-anchors)
(org-html-coding-system, org-html-divs):
* ox-ascii.el (org-ascii-text-width)
(org-ascii-headline-spacing, org-ascii-indented-line-width)
(org-ascii-paragraph-spacing, org-ascii-charset)
(org-ascii-underline, org-ascii-bullets)
(org-ascii-links-to-notes)
(org-ascii-table-keep-all-vertical-lines)
(org-ascii-table-widen-columns)
(org-ascii-table-use-ascii-art)
(org-ascii-format-drawer-function)
(org-ascii-format-inlinetask-function):
* org.el (org-modules, org-export-backends)
(org-highlight-latex-and-related, orgstruct-setup-hook):
* org-attach.el (org-attach-git-annex-cutoff):
* org-archive.el (org-archive-file-header-format):
* org-agenda.el (org-agenda-todo-ignore-time-comparison-use-seconds):
* ob-python.el (org-babel-python-hline-to)
(org-babel-python-None-to):
* ob-ditaa.el (org-ditaa-eps-jar-path):
* ob-core.el (org-babel-results-keyword): Add :version and
:package-version.
* ox-ascii.el: Use utf-8-emacs as the file coding system.
2013-03-05 10:34:16 -05:00
|
|
|
:version "24.4"
|
|
|
|
:package-version '(Org . "8.0")
|
2013-11-14 08:05:18 -05:00
|
|
|
:type 'symbol)
|
2012-10-30 20:04:41 -04:00
|
|
|
|
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'."
|
2017-04-29 10:26:33 -04:00
|
|
|
(let* ((org-babel-python-command
|
|
|
|
(or (cdr (assq :python params))
|
|
|
|
org-babel-python-command))
|
|
|
|
(session (org-babel-python-initiate-session
|
2016-09-22 13:45:15 -04:00
|
|
|
(cdr (assq :session params))))
|
|
|
|
(result-params (cdr (assq :result-params params)))
|
|
|
|
(result-type (cdr (assq :result-type params)))
|
2020-09-27 11:41:26 -04:00
|
|
|
(return-val (when (eq result-type 'value)
|
2016-09-22 13:45:15 -04:00
|
|
|
(cdr (assq :return params))))
|
|
|
|
(preamble (cdr (assq :preamble params)))
|
2021-05-18 11:45:05 -04:00
|
|
|
(async (org-babel-comint-use-async params))
|
2010-10-21 07:28:19 -04:00
|
|
|
(full-body
|
2020-09-27 11:41:26 -04:00
|
|
|
(concat
|
|
|
|
(org-babel-expand-body:generic
|
|
|
|
body params
|
|
|
|
(org-babel-variable-assignments:python params))
|
|
|
|
(when return-val
|
|
|
|
(format (if session "\n%s" "\nreturn %s") return-val))))
|
2010-07-02 22:21:31 -04:00
|
|
|
(result (org-babel-python-evaluate
|
2021-05-18 11:45:05 -04:00
|
|
|
session full-body result-type
|
|
|
|
result-params preamble async)))
|
2010-12-21 05:21:28 -05:00
|
|
|
(org-babel-reassemble-table
|
|
|
|
result
|
2016-09-22 13:45:15 -04:00
|
|
|
(org-babel-pick-name (cdr (assq :colname-names params))
|
|
|
|
(cdr (assq :colnames params)))
|
|
|
|
(org-babel-pick-name (cdr (assq :rowname-names params))
|
|
|
|
(cdr (assq :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.
|
2019-09-20 18:27:53 -04:00
|
|
|
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)
|
2020-02-18 16:57:37 -05:00
|
|
|
(org-babel-comint-wait-for-output session))
|
|
|
|
var-lines))
|
2010-01-11 12:14:30 -05:00
|
|
|
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))))
|
2015-10-29 15:26:11 -04:00
|
|
|
(org-babel--get-vars params)))
|
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 ", ") "]")
|
2016-09-25 11:29:06 -04:00
|
|
|
(if (eq var 'hline)
|
2012-10-30 20:04:41 -04:00
|
|
|
org-babel-python-hline-to
|
2010-07-14 14:31:38 -04:00
|
|
|
(format
|
2014-01-08 12:31:50 -05:00
|
|
|
(if (and (stringp var) (string-match "[\n\r]" var)) "\"\"%S\"\"" "%S")
|
2014-01-22 11:10:55 -05:00
|
|
|
(if (stringp var) (substring-no-properties var) 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."
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 14:57:31 -05:00
|
|
|
(let ((res (org-babel-script-escape results)))
|
|
|
|
(if (listp res)
|
2016-09-25 11:29:06 -04:00
|
|
|
(mapcar (lambda (el) (if (eq el 'None)
|
2021-09-29 03:22:47 -04:00
|
|
|
org-babel-python-None-to el))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 14:57:31 -05:00
|
|
|
res)
|
|
|
|
res)))
|
2009-06-12 11:46:00 -04:00
|
|
|
|
2013-03-29 12:31:37 -04:00
|
|
|
(defvar org-babel-python-buffers '((:default . "*Python*")))
|
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)))
|
|
|
|
|
2013-11-17 03:12:41 -05:00
|
|
|
(defun org-babel-python-with-earmuffs (session)
|
2013-03-29 12:45:01 -04:00
|
|
|
(let ((name (if (stringp session) session (format "%s" session))))
|
|
|
|
(if (and (string= "*" (substring name 0 1))
|
|
|
|
(string= "*" (substring name (- (length name) 1))))
|
|
|
|
name
|
|
|
|
(format "*%s*" name))))
|
|
|
|
|
2013-11-17 03:12:41 -05:00
|
|
|
(defun org-babel-python-without-earmuffs (session)
|
2013-03-29 12:45:01 -04:00
|
|
|
(let ((name (if (stringp session) session (format "%s" session))))
|
|
|
|
(if (and (string= "*" (substring name 0 1))
|
|
|
|
(string= "*" (substring name (- (length name) 1))))
|
|
|
|
(substring name 1 (- (length name) 1))
|
|
|
|
name)))
|
|
|
|
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 14:57:31 -05:00
|
|
|
(defvar py-which-bufname)
|
|
|
|
(defvar python-shell-buffer-name)
|
2022-11-14 22:39:04 -05:00
|
|
|
(defvar-local org-babel-python--initialized nil
|
|
|
|
"Flag used to mark that python session has been initialized.")
|
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."
|
2009-06-12 17:48:40 -04:00
|
|
|
(save-window-excursion
|
|
|
|
(let* ((session (if session (intern session) :default))
|
2020-08-24 23:17:57 -04:00
|
|
|
(py-buffer (org-babel-python-session-buffer session))
|
2013-08-12 15:12:16 -04:00
|
|
|
(cmd (if (member system-type '(cygwin windows-nt ms-dos))
|
|
|
|
(concat org-babel-python-command " -i")
|
|
|
|
org-babel-python-command)))
|
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
|
2020-09-06 20:41:04 -04:00
|
|
|
((eq 'python org-babel-python-mode) ; python.el
|
|
|
|
(unless py-buffer
|
|
|
|
(setq py-buffer (org-babel-python-with-earmuffs session)))
|
|
|
|
(let ((python-shell-buffer-name
|
|
|
|
(org-babel-python-without-earmuffs py-buffer)))
|
2022-11-14 22:39:04 -05:00
|
|
|
(run-python cmd)
|
|
|
|
(with-current-buffer py-buffer
|
|
|
|
(add-hook
|
|
|
|
'python-shell-first-prompt-hook
|
|
|
|
(lambda ()
|
|
|
|
(setq-local org-babel-python--initialized t)
|
|
|
|
(message "I am running!!!"))
|
|
|
|
nil 'local))))
|
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
|
2020-08-24 23:17:57 -04:00
|
|
|
(require 'python-mode)
|
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.
|
2022-10-26 00:38:58 -04:00
|
|
|
(py-choose-shell)
|
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
|
2020-08-24 23:17:57 -04:00
|
|
|
(let* ((bufname (if (and py-buffer (buffer-live-p py-buffer))
|
2010-07-04 12:48:12 -04:00
|
|
|
(replace-regexp-in-string ;; zap surrounding *
|
2020-08-24 23:17:57 -04:00
|
|
|
"^\\*\\([^*]+\\)\\*$" "\\1" py-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))
|
2020-08-24 23:17:57 -04:00
|
|
|
(setq py-buffer (org-babel-python-with-earmuffs bufname))
|
|
|
|
(py-shell nil nil t org-babel-python-command py-buffer nil nil t nil)))
|
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
|
|
|
(t
|
2012-09-28 11:47:48 -04:00
|
|
|
(error "No function available for running an inferior Python")))
|
2022-08-27 10:06:11 -04:00
|
|
|
;; Wait until Python initializes.
|
2022-11-14 22:39:04 -05:00
|
|
|
(if (eq 'python org-babel-python-mode) ; python.el
|
|
|
|
;; This is more reliable compared to
|
|
|
|
;; `org-babel-comint-wait-for-output' as python may emit
|
|
|
|
;; multiple prompts during initialization.
|
|
|
|
(with-current-buffer py-buffer
|
|
|
|
(while (not org-babel-python--initialized)
|
|
|
|
(org-babel-comint-wait-for-output py-buffer)))
|
|
|
|
(org-babel-comint-wait-for-output py-buffer))
|
2010-07-04 12:48:12 -04:00
|
|
|
(setq org-babel-python-buffers
|
2020-08-24 23:17:57 -04:00
|
|
|
(cons (cons session py-buffer)
|
2010-07-04 12:48:12 -04:00
|
|
|
(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
|
|
|
|
2015-10-25 20:56:00 -04: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))))
|
|
|
|
|
2020-09-09 09:24:07 -04:00
|
|
|
(defvar org-babel-python-eoe-indicator "org_babel_python_eoe"
|
|
|
|
"A string to indicate that evaluation has completed.")
|
|
|
|
|
2015-01-22 01:55:23 -05:00
|
|
|
(defconst org-babel-python-wrapper-method
|
2009-06-15 14:14:32 -04:00
|
|
|
"
|
|
|
|
def main():
|
|
|
|
%s
|
|
|
|
|
|
|
|
open('%s', 'w').write( str(main()) )")
|
2015-01-22 01:55:23 -05:00
|
|
|
(defconst org-babel-python-pp-wrapper-method
|
2009-10-18 15:14:39 -04:00
|
|
|
"
|
|
|
|
import pprint
|
|
|
|
def main():
|
|
|
|
%s
|
|
|
|
|
|
|
|
open('%s', 'w').write( pprint.pformat(main()) )")
|
2009-06-12 11:46:00 -04:00
|
|
|
|
2020-08-24 23:17:57 -04:00
|
|
|
(defconst org-babel-python--exec-tmpfile "\
|
2020-10-06 17:06:08 -04:00
|
|
|
with open('%s') as __org_babel_python_tmpfile:
|
|
|
|
exec(compile(__org_babel_python_tmpfile.read(), __org_babel_python_tmpfile.name, 'exec'))"
|
2020-08-24 23:17:57 -04:00
|
|
|
"Template for Python session command with output results.
|
|
|
|
|
|
|
|
Has a single %s escape, the tempfile containing the source code
|
|
|
|
to evaluate.")
|
2017-12-02 04:03:00 -05:00
|
|
|
|
2020-09-07 12:39:21 -04:00
|
|
|
(defun org-babel-python-format-session-value
|
|
|
|
(src-file result-file result-params)
|
|
|
|
"Return Python code to evaluate SRC-FILE and write result to RESULT-FILE."
|
|
|
|
(format "\
|
ob-python: Fix several issues with :session :results value
* lisp/ob-python.el (org-babel-python-evaluate-session): Fix a few
related issues with :session :results value blocks, including broken
if-else statements, indented blocks with blank lines, and returning
the wrong value when underscore has been used.
(org-babel-python--eval-ast): New constant variable, a string
consisting of Python code to execute a source block using ast.
Previously, python blocks with parameters ":session :results value"
were entered line-by-line into the Python session, which could cause
issues around indentation and new lines. Now, such python blocks are
written to temp files, then the built-in ast python module is used to
parse and execute them, and to extract the last line separately to
return as a result. Introduces a change in behavior, requiring that
the last line must be a top-level expression statement if its result
is to be saved (otherwise, the result is None).
2020-01-20 20:40:22 -05:00
|
|
|
import ast
|
2020-10-06 17:06:08 -04:00
|
|
|
with open('%s') as __org_babel_python_tmpfile:
|
|
|
|
__org_babel_python_ast = ast.parse(__org_babel_python_tmpfile.read())
|
2020-08-24 23:17:57 -04:00
|
|
|
__org_babel_python_final = __org_babel_python_ast.body[-1]
|
|
|
|
if isinstance(__org_babel_python_final, ast.Expr):
|
|
|
|
__org_babel_python_ast.body = __org_babel_python_ast.body[:-1]
|
|
|
|
exec(compile(__org_babel_python_ast, '<string>', 'exec'))
|
|
|
|
__org_babel_python_final = eval(compile(ast.Expression(
|
|
|
|
__org_babel_python_final.value), '<string>', 'eval'))
|
2020-10-06 17:06:08 -04:00
|
|
|
with open('%s', 'w') as __org_babel_python_tmpfile:
|
2020-08-24 23:17:57 -04:00
|
|
|
if %s:
|
|
|
|
import pprint
|
2020-10-06 17:06:08 -04:00
|
|
|
__org_babel_python_tmpfile.write(pprint.pformat(__org_babel_python_final))
|
2020-08-24 23:17:57 -04:00
|
|
|
else:
|
2020-10-06 17:06:08 -04:00
|
|
|
__org_babel_python_tmpfile.write(str(__org_babel_python_final))
|
2020-08-24 23:17:57 -04:00
|
|
|
else:
|
|
|
|
exec(compile(__org_babel_python_ast, '<string>', 'exec'))
|
|
|
|
__org_babel_python_final = None"
|
2020-09-07 12:39:21 -04:00
|
|
|
(org-babel-process-file-name src-file 'noquote)
|
|
|
|
(org-babel-process-file-name result-file 'noquote)
|
|
|
|
(if (member "pp" result-params) "True" "False")))
|
ob-python: Fix several issues with :session :results value
* lisp/ob-python.el (org-babel-python-evaluate-session): Fix a few
related issues with :session :results value blocks, including broken
if-else statements, indented blocks with blank lines, and returning
the wrong value when underscore has been used.
(org-babel-python--eval-ast): New constant variable, a string
consisting of Python code to execute a source block using ast.
Previously, python blocks with parameters ":session :results value"
were entered line-by-line into the Python session, which could cause
issues around indentation and new lines. Now, such python blocks are
written to temp files, then the built-in ast python module is used to
parse and execute them, and to extract the last line separately to
return as a result. Introduces a change in behavior, requiring that
the last line must be a top-level expression statement if its result
is to be saved (otherwise, the result is None).
2020-01-20 20:40:22 -05:00
|
|
|
|
2010-07-02 22:21:31 -04:00
|
|
|
(defun org-babel-python-evaluate
|
2021-09-29 03:22:47 -04:00
|
|
|
(session body &optional result-type result-params preamble async)
|
2012-09-28 11:47:48 -04:00
|
|
|
"Evaluate BODY as Python code."
|
2010-09-07 21:58:58 -04:00
|
|
|
(if session
|
2021-05-18 11:45:05 -04:00
|
|
|
(if async
|
|
|
|
(org-babel-python-async-evaluate-session
|
|
|
|
session body result-type result-params)
|
|
|
|
(org-babel-python-evaluate-session
|
|
|
|
session body result-type result-params))
|
2010-09-07 21:58:58 -04:00
|
|
|
(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
|
|
|
|
2020-09-09 09:24:07 -04:00
|
|
|
(defun org-babel-python--shift-right (body &optional count)
|
|
|
|
(with-temp-buffer
|
|
|
|
(python-mode)
|
|
|
|
(insert body)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (not (eobp))
|
|
|
|
(unless (python-syntax-context 'string)
|
|
|
|
(python-indent-shift-right (line-beginning-position)
|
|
|
|
(line-end-position)
|
|
|
|
count))
|
|
|
|
(forward-line 1))
|
|
|
|
(buffer-string)))
|
|
|
|
|
2010-09-07 21:58:58 -04:00
|
|
|
(defun org-babel-python-evaluate-external-process
|
2016-06-21 09:24:06 -04:00
|
|
|
(body &optional result-type result-params preamble)
|
2010-09-07 21:58:58 -04:00
|
|
|
"Evaluate BODY in external python process.
|
2015-09-21 00:24:12 -04:00
|
|
|
If RESULT-TYPE equals `output' then return standard output as a
|
|
|
|
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."
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 14:57:31 -05:00
|
|
|
(let ((raw
|
2016-07-25 10:34:48 -04:00
|
|
|
(pcase result-type
|
|
|
|
(`output (org-babel-eval org-babel-python-command
|
2018-05-09 20:14:24 -04:00
|
|
|
(concat preamble (and preamble "\n")
|
2016-07-25 10:34:48 -04:00
|
|
|
body)))
|
|
|
|
(`value (let ((tmp-file (org-babel-temp-file "python-")))
|
|
|
|
(org-babel-eval
|
|
|
|
org-babel-python-command
|
|
|
|
(concat
|
2018-05-09 20:14:24 -04:00
|
|
|
preamble (and preamble "\n")
|
2016-07-25 10:34:48 -04:00
|
|
|
(format
|
|
|
|
(if (member "pp" result-params)
|
|
|
|
org-babel-python-pp-wrapper-method
|
|
|
|
org-babel-python-wrapper-method)
|
2020-09-09 09:24:07 -04:00
|
|
|
(org-babel-python--shift-right body)
|
2016-07-25 10:34:48 -04:00
|
|
|
(org-babel-process-file-name tmp-file 'noquote))))
|
|
|
|
(org-babel-eval-read-file tmp-file))))))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 14:57:31 -05:00
|
|
|
(org-babel-result-cond result-params
|
|
|
|
raw
|
2016-06-21 09:24:06 -04:00
|
|
|
(org-babel-python-table-or-string (org-trim raw)))))
|
2010-09-07 21:58:58 -04:00
|
|
|
|
2020-09-06 20:45:08 -04:00
|
|
|
(defun org-babel-python--send-string (session body)
|
|
|
|
"Pass BODY to the Python process in SESSION.
|
|
|
|
Return output."
|
|
|
|
(with-current-buffer session
|
|
|
|
(let* ((string-buffer "")
|
|
|
|
(comint-output-filter-functions
|
|
|
|
(cons (lambda (text) (setq string-buffer
|
|
|
|
(concat string-buffer text)))
|
2020-09-09 09:24:07 -04:00
|
|
|
comint-output-filter-functions))
|
|
|
|
(body (format "\
|
|
|
|
try:
|
|
|
|
%s
|
|
|
|
except:
|
|
|
|
raise
|
|
|
|
finally:
|
|
|
|
print('%s')"
|
|
|
|
(org-babel-python--shift-right body 4)
|
|
|
|
org-babel-python-eoe-indicator)))
|
2020-09-06 20:45:08 -04:00
|
|
|
(if (not (eq 'python-mode org-babel-python-mode))
|
|
|
|
(let ((python-shell-buffer-name
|
|
|
|
(org-babel-python-without-earmuffs session)))
|
|
|
|
(python-shell-send-string body))
|
|
|
|
(require 'python-mode)
|
|
|
|
(py-shell-send-string body (get-buffer-process session)))
|
|
|
|
;; same as `python-shell-comint-end-of-output-p' in emacs-25.1+
|
|
|
|
(while (not (string-match
|
2020-09-09 09:24:07 -04:00
|
|
|
org-babel-python-eoe-indicator
|
2020-09-06 20:45:08 -04:00
|
|
|
string-buffer))
|
|
|
|
(accept-process-output (get-buffer-process (current-buffer))))
|
2020-09-09 09:24:07 -04:00
|
|
|
(org-babel-chomp (substring string-buffer 0 (match-beginning 0))))))
|
2020-09-06 20:45:08 -04:00
|
|
|
|
2010-09-07 21:58:58 -04:00
|
|
|
(defun org-babel-python-evaluate-session
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 14:57:31 -05:00
|
|
|
(session body &optional result-type result-params)
|
2010-09-07 21:58:58 -04:00
|
|
|
"Pass BODY to the Python process in SESSION.
|
2015-09-21 00:24:12 -04:00
|
|
|
If RESULT-TYPE equals `output' then return standard output as a
|
|
|
|
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."
|
2020-09-06 20:45:08 -04:00
|
|
|
(let* ((tmp-src-file (org-babel-temp-file "python-"))
|
2020-09-04 20:37:05 -04:00
|
|
|
(results
|
2020-08-24 23:17:57 -04:00
|
|
|
(progn
|
|
|
|
(with-temp-file tmp-src-file (insert body))
|
2020-09-04 20:37:05 -04:00
|
|
|
(pcase result-type
|
2020-08-24 23:17:57 -04:00
|
|
|
(`output
|
2020-09-06 20:45:08 -04:00
|
|
|
(let ((body (format org-babel-python--exec-tmpfile
|
|
|
|
(org-babel-process-file-name
|
|
|
|
tmp-src-file 'noquote))))
|
|
|
|
(org-babel-python--send-string session body)))
|
2020-09-04 20:37:05 -04:00
|
|
|
(`value
|
|
|
|
(let* ((tmp-results-file (org-babel-temp-file "python-"))
|
2020-09-07 12:39:21 -04:00
|
|
|
(body (org-babel-python-format-session-value
|
|
|
|
tmp-src-file tmp-results-file result-params)))
|
2020-09-06 20:45:08 -04:00
|
|
|
(org-babel-python--send-string session body)
|
|
|
|
(sleep-for 0 10)
|
2020-09-04 20:37:05 -04:00
|
|
|
(org-babel-eval-read-file tmp-results-file)))))))
|
2020-09-06 20:45:08 -04:00
|
|
|
(org-babel-result-cond result-params
|
|
|
|
results
|
|
|
|
(org-babel-python-table-or-string results))))
|
2009-06-12 11:46:00 -04:00
|
|
|
|
2009-06-12 19:23:28 -04:00
|
|
|
(defun org-babel-python-read-string (string)
|
2015-09-21 00:24:12 -04:00
|
|
|
"Strip \\='s from around Python string."
|
2016-08-24 11:05:54 -04:00
|
|
|
(if (and (string-prefix-p "'" string)
|
|
|
|
(string-suffix-p "'" string))
|
|
|
|
(substring string 1 -1)
|
2009-06-12 19:23:28 -04:00
|
|
|
string))
|
|
|
|
|
2021-05-18 11:45:05 -04:00
|
|
|
;; Async session eval
|
|
|
|
|
|
|
|
(defconst org-babel-python-async-indicator "print ('ob_comint_async_python_%s_%s')")
|
|
|
|
|
|
|
|
(defun org-babel-python-async-value-callback (params tmp-file)
|
|
|
|
(let ((result-params (cdr (assq :result-params params)))
|
|
|
|
(results (org-babel-eval-read-file tmp-file)))
|
|
|
|
(org-babel-result-cond result-params
|
|
|
|
results
|
|
|
|
(org-babel-python-table-or-string results))))
|
|
|
|
|
|
|
|
(defun org-babel-python-async-evaluate-session
|
|
|
|
(session body &optional result-type result-params)
|
|
|
|
"Asynchronously evaluate BODY in SESSION.
|
|
|
|
Returns a placeholder string for insertion, to later be replaced
|
|
|
|
by `org-babel-comint-async-filter'."
|
|
|
|
(org-babel-comint-async-register
|
|
|
|
session (current-buffer)
|
|
|
|
"ob_comint_async_python_\\(.+\\)_\\(.+\\)"
|
|
|
|
'org-babel-chomp 'org-babel-python-async-value-callback)
|
|
|
|
(let ((python-shell-buffer-name (org-babel-python-without-earmuffs session)))
|
|
|
|
(pcase result-type
|
|
|
|
(`output
|
|
|
|
(let ((uuid (md5 (number-to-string (random 100000000)))))
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert (format org-babel-python-async-indicator "start" uuid))
|
|
|
|
(insert "\n")
|
|
|
|
(insert body)
|
|
|
|
(insert "\n")
|
|
|
|
(insert (format org-babel-python-async-indicator "end" uuid))
|
|
|
|
(python-shell-send-buffer))
|
|
|
|
uuid))
|
|
|
|
(`value
|
|
|
|
(let ((tmp-results-file (org-babel-temp-file "python-"))
|
|
|
|
(tmp-src-file (org-babel-temp-file "python-")))
|
|
|
|
(with-temp-file tmp-src-file (insert body))
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert (org-babel-python-format-session-value tmp-src-file tmp-results-file result-params))
|
|
|
|
(insert "\n")
|
|
|
|
(insert (format org-babel-python-async-indicator "file" tmp-results-file))
|
|
|
|
(python-shell-send-buffer))
|
|
|
|
tmp-results-file)))))
|
|
|
|
|
2010-06-11 19:02:42 -04:00
|
|
|
(provide 'ob-python)
|
2010-06-25 12:32:35 -04:00
|
|
|
|
2010-06-11 19:02:42 -04:00
|
|
|
;;; ob-python.el ends here
|