From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kyle Meyer Subject: Re: Extraneous output from Python code blocks using :session option Date: Fri, 13 Mar 2015 02:58:35 -0400 Message-ID: <87d24dtmck.fsf@kmlap.domain.org> References: <1931A590-8B23-4412-86C7-F3571EC466FF@haas.berkeley.edu> <87r3sv2xra.fsf@kyleam.com> <210D96E7-43E3-4438-8401-7841C6612023@haas.berkeley.edu> <87bnjxq59p.fsf@kyleam.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YWJUB-0000N3-AH for emacs-orgmode@gnu.org; Fri, 13 Mar 2015 02:54:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YWJU5-0002uo-P4 for emacs-orgmode@gnu.org; Fri, 13 Mar 2015 02:54:19 -0400 Received: from mail-qg0-f54.google.com ([209.85.192.54]:41324) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YWJU5-0002uU-Kn for emacs-orgmode@gnu.org; Fri, 13 Mar 2015 02:54:13 -0400 Received: by qgea108 with SMTP id a108so23849416qge.8 for ; Thu, 12 Mar 2015 23:54:13 -0700 (PDT) In-Reply-To: <87bnjxq59p.fsf@kyleam.com> (Kyle Meyer's message of "Thu, 12 Mar 2015 17:23:30 -0400") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Richard Stanton Cc: emacs-orgmode@gnu.org, John Kitchin --=-=-= Content-Type: text/plain Kyle Meyer wrote: > Richard Stanton wrote: >> This looks great. While we're patching this code, why does having >> blank lines inside function definitions cause such problems in >> :session mode? > > I think this is because the lines are being sent one by one, so sending > the blank line causes an issue, like typing enter with the cursor at _: > > >>> def abc(): > >>> _ > > ... > File "", line 2 > > ^ > IndentationError: expected an indented block > >>> > > I'll take a look at fixing this. python.el in Emacs 24 seems to send > functions with blank lines over fine, so perhaps I can use it as an > example. I've attached two patches. The first one is a proposed way to deal with the indentation issues in sessions. It is very similar to what python.el does for multiline input (use a temporary file and then execute that from the shell). The second is an update of my previous patch to remove shell prompt characters that are leaking into the output. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-ob-python.el-Allow-indented-code-in-sessions.patch >From 28f271314f7bff7c54696defe8e451da69cd2d6c Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Fri, 13 Mar 2015 02:45:04 -0400 Subject: [PATCH 1/2] ob-python.el: Allow indented code in sessions * lisp/ob-python.el (org-babel-python-evaluate-session): Recognize indented code in session and treat it differently to avoid syntax errors. For session blocks with results set to 'output', go through an intermediate file when there is indented code to prevent indentation-related errors when sending code to the Python shell. For session blocks with results set to 'value', issue an user-error. These (usually) would have resulted in a syntax error in the shell anyway, and the '_' variable can't be used to get the last value here (as it is for non-indented code) because it isn't set when executing the code through a file. --- lisp/ob-python.el | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/lisp/ob-python.el b/lisp/ob-python.el index dd3cc66..8c51679 100644 --- a/lisp/ob-python.el +++ b/lisp/ob-python.el @@ -238,6 +238,14 @@ (defconst org-babel-python-pp-wrapper-method open('%s', 'w').write( pprint.pformat(main()) )") +(defconst org-babel-python-indented-lines-session-method + (concat "fname= '%s'; fh = open(fname); " + "exec(compile(fh.read(), fname, 'exec')); " + "fh.close()") + "Single line to execute indented Python code in session. +%s will be formatted with the file name of the file containing + the code.") + (defun org-babel-python-evaluate (session body &optional result-type result-params preamble) "Evaluate BODY as Python code." @@ -303,6 +311,13 @@ (defun org-babel-python-evaluate-session (mapc (lambda (line) (insert line) (funcall send-wait)) (split-string body "[\r\n]")) (funcall send-wait))) + (indented-p (org-babel-python--indented-p body)) + (body (if indented-p + (let ((tmp-file (org-babel-temp-file "python-"))) + (with-temp-file tmp-file (insert body)) + (format org-babel-python-indented-lines-session-method + tmp-file)) + body)) (results (case result-type (output @@ -317,6 +332,8 @@ (defun org-babel-python-evaluate-session (funcall send-wait)) 2) "\n")) (value + (when indented-p + (user-error "Value output limited to unindented lines with session")) (let ((tmp-file (org-babel-temp-file "python-"))) (org-babel-comint-with-output (session org-babel-python-eoe-indicator nil body) @@ -339,6 +356,13 @@ (defun org-babel-python-read-string (string) (match-string 1 string) string)) +(defun org-babel-python--indented-p (input) + "Return true if any line in INPUT is indented." + (with-temp-buffer + (insert input) + (goto-char (point-min)) + (re-search-forward "^\\s-" nil t))) + (provide 'ob-python) -- 2.3.1 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-ob-python.el-Strip-leading-session-characters.patch >From 3d433fac1162f1544fbcfc7e4a8675a258764f34 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Fri, 13 Mar 2015 02:46:38 -0400 Subject: [PATCH 2/2] ob-python.el: Strip leading session characters * lisp/ob-python.el (org-babel-python-evaluate-session): Strip extra leading "..." and ">>>" from session output. --- lisp/ob-python.el | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/lisp/ob-python.el b/lisp/ob-python.el index 8c51679..170b6cd 100644 --- a/lisp/ob-python.el +++ b/lisp/ob-python.el @@ -321,16 +321,17 @@ (defun org-babel-python-evaluate-session (results (case result-type (output - (mapconcat - #'org-babel-trim - (butlast - (org-babel-comint-with-output - (session org-babel-python-eoe-indicator t body) - (funcall input-body body) - (funcall send-wait) (funcall send-wait) - (insert org-babel-python-eoe-indicator) - (funcall send-wait)) - 2) "\n")) + (org-babel-python--strip-session-chars + (mapconcat + #'org-babel-chomp + (butlast + (org-babel-comint-with-output + (session org-babel-python-eoe-indicator t body) + (funcall input-body body) + (funcall send-wait) (funcall send-wait) + (insert org-babel-python-eoe-indicator) + (funcall send-wait)) + 2) "\n"))) (value (when indented-p (user-error "Value output limited to unindented lines with session")) @@ -363,6 +364,19 @@ (defun org-babel-python--indented-p (input) (goto-char (point-min)) (re-search-forward "^\\s-" nil t))) +(defun org-babel-python--strip-session-chars (string) + "Remove leading '>>>' and '...' from Python session output. +`org-babel-comint-with-output' splits by +`comint-prompt-regexp' (which includes '>>>' and '...'), but, in +some situations, these still make it through at the start of the +output string." + (with-temp-buffer + (insert string) + (goto-char (point-min)) + (when (looking-at "\\s-*\n\\(\\(>>> \\)\\|\\(\\.\\.\\. \\)\\)*") + (delete-region (match-beginning 0) (match-end 0))) + (buffer-string))) + (provide 'ob-python) -- 2.3.1 --=-=-= Content-Type: text/plain -- Kyle --=-=-=--