From e45cf15b069e8d6379708a28bb0f727a894c364f Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Sun, 5 Jul 2009 19:55:54 -0400 Subject: [PATCH] Bug fix: I was missing out org-babel-table-or-string with external process evaluation (non-session). Also, I have renamed org-babel-table-or-results to org-babel-table-or-string. --- lisp/langs/org-babel-python.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/langs/org-babel-python.el b/lisp/langs/org-babel-python.el index 597923ec..2fa27a0f 100644 --- a/lisp/langs/org-babel-python.el +++ b/lisp/langs/org-babel-python.el @@ -79,7 +79,7 @@ specifying a var of the same value." (concat "[" (mapconcat #'org-babel-python-var-to-python var ", ") "]") (format "%S" var))) -(defun org-babel-python-table-or-results (results) +(defun org-babel-python-table-or-string (results) "If the results look like a table, then convert them into an Emacs-lisp table, otherwise return the results as a string." (org-babel-read @@ -153,7 +153,8 @@ last statement in BODY." tmp-file)) ;; (message "buffer=%s" (buffer-string)) ;; debugging (shell-command-on-region (point-min) (point-max) "python")) - (with-temp-buffer (insert-file-contents tmp-file) (buffer-string)))))) + (org-babel-python-table-or-string + (with-temp-buffer (insert-file-contents tmp-file) (buffer-string))))))) ;; comint session evaluation (org-babel-comint-in-buffer buffer (let* ((full-body @@ -170,7 +171,7 @@ last statement in BODY." (setq results (mapcar #'org-babel-python-read-string results)) (case result-type (output (org-babel-trim (mapconcat #'identity (reverse (cdr results)) "\n"))) - (value (org-babel-python-table-or-results (org-babel-trim (car results))))))))) + (value (org-babel-python-table-or-string (org-babel-trim (car results))))))))) (defun org-babel-python-read-string (string) "Strip 's from around ruby string" -- 2.11.4.GIT