From: Jack Kamm <jackkamm@gmail.com>
To: Kyle Meyer <kyle@kyleam.com>, No Wayman <iarchivedmywholelife@gmail.com>
Cc: Bastien <bzg@gnu.org>, emacs-orgmode@gnu.org
Subject: Re: [PATCH] org-add-planning-info: respect caller's given time [9.3.7 (release_9.3.7-716-g3d4876 @ /home/n/.emacs.d/straight/build/org/)]
Date: Tue, 08 Sep 2020 07:23:24 -0700 [thread overview]
Message-ID: <877dt4bb4z.fsf@gmail.com> (raw)
In-Reply-To: <871rjcan53.fsf@kyleam.com>
[-- Attachment #1: Type: text/plain, Size: 820 bytes --]
Kyle Meyer <kyle@kyleam.com> writes:
> That's on a Debian system with the python executable pointing to Python
> 2.7.16. If I set org-babel-python-command to python3 (3.7.3) at the top
> of test-ob-python.el, I see the same thing. I haven't dug any farther
> yet. Jack, presumably you don't see the stall on your end?
No, the tests don't stall on my end (Archlinux with manually compiled
emacs 28). I also tested on a debian10vm and the tests passed there too.
But since we know it's related to 4df12ea39 that gives some
clues...could you try the attached patch to see if it fixes things?
Also, could you try executing some simple ob-python session blocks and
see if they hang? e.g.,
#+begin_src python :session :results output
print(1+1)
#+end_src
#+begin_src python :session :results value
1+1
#+end_src
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: python-eoe-patch.patch --]
[-- Type: text/x-patch, Size: 1728 bytes --]
diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index 1cded4515..a5af55892 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -223,6 +223,9 @@ (defun org-babel-python-initiate-session (&optional session _params)
(org-babel-python-session-buffer
(org-babel-python-initiate-session-by-key session))))
+(defvar org-babel-python-eoe-indicator "org_babel_python_eoe"
+ "A string to indicate that evaluation has completed.")
+
(defconst org-babel-python-wrapper-method
"
def main():
@@ -324,7 +327,9 @@ (defun org-babel-python--send-string (session body)
(comint-output-filter-functions
(cons (lambda (text) (setq string-buffer
(concat string-buffer text)))
- comint-output-filter-functions)))
+ comint-output-filter-functions))
+ (body (format "%s\nprint('%s')"
+ body org-babel-python-eoe-indicator)))
(if (not (eq 'python-mode org-babel-python-mode))
(let ((python-shell-buffer-name
(org-babel-python-without-earmuffs session)))
@@ -333,13 +338,10 @@ (defun org-babel-python--send-string (session body)
(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
- (concat "\r?\n?"
- (replace-regexp-in-string
- (rx string-start ?^) "" comint-prompt-regexp)
- (rx eos))
+ org-babel-python-eoe-indicator
string-buffer))
(accept-process-output (get-buffer-process (current-buffer))))
- (substring string-buffer 0 (match-beginning 0)))))
+ (org-babel-chomp (substring string-buffer 0 (match-beginning 0))))))
(defun org-babel-python-evaluate-session
(session body &optional result-type result-params)
next prev parent reply other threads:[~2020-09-08 14:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-18 22:16 [PATCH] org-add-planning-info: respect caller's given time [9.3.7 (release_9.3.7-716-g3d4876 @ /home/n/.emacs.d/straight/build/org/)] No Wayman
2020-09-05 15:59 ` Bastien
2020-09-05 16:13 ` No Wayman
2020-09-06 5:54 ` Bastien
2020-09-06 10:03 ` Bastien
2020-09-07 16:22 ` No Wayman
2020-09-08 4:49 ` Kyle Meyer
2020-09-08 14:23 ` Jack Kamm [this message]
2020-09-09 4:37 ` No Wayman
2020-09-09 4:49 ` Kyle Meyer
2020-09-09 13:37 ` Jack Kamm
2020-09-09 4:40 ` No Wayman
2020-09-08 8:29 ` Bastien
2020-09-09 4:37 ` No Wayman
2020-09-09 10:29 ` Bastien
2020-09-09 17:52 ` No Wayman
2020-09-10 17:11 ` No Wayman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877dt4bb4z.fsf@gmail.com \
--to=jackkamm@gmail.com \
--cc=bzg@gnu.org \
--cc=emacs-orgmode@gnu.org \
--cc=iarchivedmywholelife@gmail.com \
--cc=kyle@kyleam.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).