From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 18 12:13:57 2015 Received: (at submit) by debbugs.gnu.org; 18 Jul 2015 16:13:57 +0000 Received: from localhost ([127.0.0.1]:53213 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZGUkO-0007Nq-DV for submit@debbugs.gnu.org; Sat, 18 Jul 2015 12:13:56 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48142) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZGUkM-0007Ne-7K for submit@debbugs.gnu.org; Sat, 18 Jul 2015 12:13:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZGUkF-00086u-Sc for submit@debbugs.gnu.org; Sat, 18 Jul 2015 12:13:48 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:49280) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZGUkF-00086p-Ph for submit@debbugs.gnu.org; Sat, 18 Jul 2015 12:13:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZGUkE-0007IS-Kn for bug-gnu-emacs@gnu.org; Sat, 18 Jul 2015 12:13:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZGUkA-00086G-JY for bug-gnu-emacs@gnu.org; Sat, 18 Jul 2015 12:13:46 -0400 Received: from e.thregr.org ([80.68.88.20]:35180) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZGUkA-00086C-DO for bug-gnu-emacs@gnu.org; Sat, 18 Jul 2015 12:13:42 -0400 Received: from [151.46.221.109] (helo=[192.168.43.14]) by e.thregr.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_RC4) (envelope-from ) id 1ZGUk8-0006Pt-Ml for bug-gnu-emacs@gnu.org; Sat, 18 Jul 2015 18:13:40 +0200 To: bug-gnu-emacs@gnu.org From: Yuri D'Elia Subject: 24.5; python.el: python-shell-buffer-substring fails under certain circumstances X-Enigmail-Draft-Status: N1110 Message-ID: <55AA7B2D.9060208@thregr.org> Date: Sat, 18 Jul 2015 18:13:33 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Icedove/38.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------010104030308080106090107" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) This is a multi-part message in MIME format. --------------010104030308080106090107 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Assuming some python buffer like: #.... if 1: print 1 where the selected region is "print \"1\"" (mark before "p"), `python-shell-send-region' would fail with: File "test.py", line 3 print 1 ^ IndentationError: expected an indented block The reason lies within `python-shell-buffer-substring', which assumes that a region always starts with the correct indentation. The attached patch fixes the above behavior: when the region doesn't start with indentation, but the current block does (looking at (current-indentation)), we prefix the fillstr with the correct amount of indent. --------------010104030308080106090107 Content-Type: text/x-diff; name="python-buffer-substring.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="python-buffer-substring.patch" --- python.el.Orig 2015-07-18 18:00:49.367517569 +0200 +++ python.el 2015-07-18 18:03:01.203659502 +0200 @@ -2548,18 +2548,22 @@ (make-string ;; Subtract 2 because of the coding cookie. (- (line-number-at-pos start) 2) ?\n)))) - (toplevel-block-p (save-excursion - (goto-char start) - (or (zerop (line-number-at-pos start)) - (progn - (python-util-forward-comment 1) - (zerop (current-indentation))))))) + (block-param (save-excursion + (goto-char start) + (progn + (python-util-forward-comment 1) + (list (current-indentation) + (/= (point) start))))) + (block-indentation (car block-param)) + (starts-with-indentation-p (cadr block-param))) (with-temp-buffer (python-mode) (if fillstr (insert fillstr)) + (when (and (> block-indentation 0) (not starts-with-indentation-p)) + (insert (make-string block-indentation ?\s))) (insert substring) (goto-char (point-min)) - (when (not toplevel-block-p) + (when (> block-indentation 0) (insert "if True:") (delete-region (point) (line-end-position))) (when nomain --------------010104030308080106090107-- From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 11 23:06:17 2015 Received: (at control) by debbugs.gnu.org; 12 Aug 2015 03:06:17 +0000 Received: from localhost ([127.0.0.1]:53617 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZPMMq-000121-Nc for submit@debbugs.gnu.org; Tue, 11 Aug 2015 23:06:16 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44769) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZPMMo-00011p-Pt for control@debbugs.gnu.org; Tue, 11 Aug 2015 23:06:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZPMMk-0004DL-K1 for control@debbugs.gnu.org; Tue, 11 Aug 2015 23:06:14 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:49802) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPMMk-0004DH-HI for control@debbugs.gnu.org; Tue, 11 Aug 2015 23:06:10 -0400 Received: from [190.246.172.180] (port=56333 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1ZPMMj-00058a-QU for control@debbugs.gnu.org; Tue, 11 Aug 2015 23:06:10 -0400 From: fgallina@gnu.org (=?utf-8?Q?Fabi=C3=A1n?= Ezequiel Gallina) To: control@debbugs.gnu.org Subject: Date: Wed, 12 Aug 2015 00:06:06 -0300 Message-ID: <87si7ptdcx.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e X-Spam-Score: -3.2 (---) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.2 (---) merge 21086 21193 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 23 19:01:25 2015 Received: (at 21086-done) by debbugs.gnu.org; 23 Aug 2015 23:01:25 +0000 Received: from localhost ([127.0.0.1]:36287 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZTeGT-0007A6-EM for submit@debbugs.gnu.org; Sun, 23 Aug 2015 19:01:25 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58287) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZTeGR-00079y-FX for 21086-done@debbugs.gnu.org; Sun, 23 Aug 2015 19:01:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZTeGM-0007DP-8O for 21086-done@debbugs.gnu.org; Sun, 23 Aug 2015 19:01:23 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54387) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZTeGM-0007DJ-5c for 21086-done@debbugs.gnu.org; Sun, 23 Aug 2015 19:01:18 -0400 Received: from [190.246.172.180] (port=56210 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1ZTeGL-0000Rj-EP for 21086-done@debbugs.gnu.org; Sun, 23 Aug 2015 19:01:17 -0400 From: fgallina@gnu.org (=?utf-8?Q?Fabi=C3=A1n?= Ezequiel Gallina) To: 21086-done@debbugs.gnu.org Subject: 24.5; python.el: python-shell-buffer-substring fails under certain circumstances Date: Sun, 23 Aug 2015 20:01:15 -0300 Message-ID: <874mjpip8k.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e X-Spam-Score: -6.2 (------) X-Debbugs-Envelope-To: 21086-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.2 (------) Fixed in master at af013e0. I installed a different patch that seems to be more robust on various conditions (see tests). Thanks for such detailed report, Fabi=C3=A1n. From unknown Sun Jun 22 03:57:14 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 21 Sep 2015 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator