gh-101400: Fix incorrect lineno in exception message on continue/break which are not in a loop #101413

corona10 · 2023-01-30T00:00:41Z

Issue: Negative line number in stacktrace exception #101400

corona10 · 2023-01-30T14:54:02Z

Without patch


======================================================================
FAIL: test_unloop_break_continue (test.test_compile.TestSpecifics.test_unloop_break_continue) (stmt='break')
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/user/oss/cpython/Lib/test/test_compile.py", line 856, in test_unloop_break_continue
    self.assertEqual(exc.lineno, 2)
AssertionError: -1 != 2

======================================================================
FAIL: test_unloop_break_continue (test.test_compile.TestSpecifics.test_unloop_break_continue) (stmt='continue')
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/user/oss/cpython/Lib/test/test_compile.py", line 856, in test_unloop_break_continue
    self.assertEqual(exc.lineno, 2)
AssertionError: -1 != 2

----------------------------------------------------------------------

iritkatriel · 2023-01-30T15:04:15Z

Lib/test/test_compile.py

+                    source = f"with object() as obj:\n    {stmt}"
+                    compile(source, f"<unloop_{stmt}>", "exec")
+                exc = err_ctx.exception
+                self.assertEqual(exc.lineno, 2)


There are some tests for break and continue outside loops in Lib/test/test_syntax.py, I think the lineno check could be added there. For instance, test_break_outside_loop calls self._check_error() but doesn't pass an expected lineno, though it could. And a similar test for continue could be added next to it.

Lib/test/test_syntax.py

Misc/NEWS.d/next/Core and Builtins/2023-01-30-08-59-47.gh-issue-101400.Di_ZFm.rst

iritkatriel

LGTM!

miss-islington · 2023-01-30T23:33:58Z

Thanks @corona10 for the PR, and @iritkatriel for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10, 3.11.
🐍🍒⛏🤖

miss-islington · 2023-01-30T23:34:05Z

Sorry, @corona10 and @iritkatriel, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker e867c1b753424d8d3f9c9ba0b431d007fd958c80 3.11

miss-islington · 2023-01-30T23:34:08Z

Sorry @corona10 and @iritkatriel, I had trouble checking out the 3.10 backport branch.
Please retry by removing and re-adding the "needs backport to 3.10" label.
Alternatively, you can backport using cherry_picker on the command line.
cherry_picker e867c1b753424d8d3f9c9ba0b431d007fd958c80 3.10

corona10 · 2023-01-30T23:35:41Z

@iritkatriel I will create the manual backport.

…continue/break which are not in a loop (pythonGH-101413). (cherry picked from commit e867c1b) Co-authored-by: Dong-hee Na <[email protected]>

bedevere-bot · 2023-01-31T03:33:53Z

GH-101447 is a backport of this pull request to the 3.11 branch.

bedevere-bot · 2023-01-31T03:35:53Z

GH-101448 is a backport of this pull request to the 3.10 branch.

…continue/break which are not in a loop (pythonGH-101413). (cherry picked from commit e867c1b) Co-authored-by: Dong-hee Na <[email protected]>

…e/break which are not in a loop (python#101413)

bedevere-bot added the awaiting core review label Jan 30, 2023

bedevere-bot mentioned this pull request Jan 30, 2023

Negative line number in stacktrace exception #101400

Closed

corona10 changed the title ~~gh-101400: Restore continue/break loc for the non-loop case~~ [WIP] gh-101400: Restore continue/break loc for the non-loop case Jan 30, 2023

corona10 added needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes labels Jan 30, 2023

corona10 added 2 commits January 30, 2023 13:43

pythongh-101400: Restore continue/break loc for the non-loop case

83c4717

Add test

f9ca546

corona10 force-pushed the gh-101400 branch from 81e5c50 to f9ca546 Compare January 30, 2023 04:43

corona10 marked this pull request as ready for review January 30, 2023 04:44

corona10 requested review from markshannon and iritkatriel as code owners January 30, 2023 04:44

corona10 changed the title ~~[WIP] gh-101400: Restore continue/break loc for the non-loop case~~ gh-101400: Restore continue/break loc for the non-loop case Jan 30, 2023

refactor test

ce2f9f6

iritkatriel changed the title ~~gh-101400: Restore continue/break loc for the non-loop case~~ gh-101400: Fix wrong lineno in exception message on continue/break which are not in a loop Jan 30, 2023

corona10 added 2 commits January 30, 2023 23:58

Update NEWS.d

7cdcf55

Fix indent

0054032

iritkatriel reviewed Jan 30, 2023

View reviewed changes

Address code review

0a088c3

corona10 requested a review from iritkatriel January 30, 2023 16:04

iritkatriel reviewed Jan 30, 2023

View reviewed changes

Lib/test/test_syntax.py Outdated Show resolved Hide resolved

iritkatriel reviewed Jan 30, 2023

View reviewed changes

Misc/NEWS.d/next/Core and Builtins/2023-01-30-08-59-47.gh-issue-101400.Di_ZFm.rst Outdated Show resolved Hide resolved

Address code review

4566f66

corona10 requested a review from iritkatriel January 30, 2023 16:36

iritkatriel approved these changes Jan 30, 2023

View reviewed changes

bedevere-bot added awaiting merge and removed awaiting core review labels Jan 30, 2023

iritkatriel changed the title ~~gh-101400: Fix wrong lineno in exception message on continue/break which are not in a loop~~ gh-101400: Fix incorrect lineno in exception message on continue/break which are not in a loop Jan 30, 2023

iritkatriel merged commit e867c1b into python:main Jan 30, 2023

bedevere-bot removed the awaiting merge label Jan 30, 2023

miss-islington assigned iritkatriel Jan 30, 2023

corona10 mentioned this pull request Jan 31, 2023

[3.11] gh-101400: Fix incorrect lineno in exception message on contin… #101447

Merged

bedevere-bot removed the needs backport to 3.11 only security fixes label Jan 31, 2023

corona10 mentioned this pull request Jan 31, 2023

[3.10] gh-101400: Fix incorrect lineno in exception message on contin… #101448

Merged

bedevere-bot removed the needs backport to 3.10 only security fixes label Jan 31, 2023

corona10 deleted the gh-101400 branch January 31, 2023 03:36

mdboom pushed a commit to mdboom/cpython that referenced this pull request Jan 31, 2023

pythongh-101400: Fix incorrect lineno in exception message on continu…

bf770d4

…e/break which are not in a loop (python#101413)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

gh-101400: Fix incorrect lineno in exception message on continue/break which are not in a loop #101413

gh-101400: Fix incorrect lineno in exception message on continue/break which are not in a loop #101413

Uh oh!

corona10 commented Jan 30, 2023 •

edited by bedevere-bot

Loading

Uh oh!

corona10 commented Jan 30, 2023

Uh oh!

iritkatriel Jan 30, 2023

Uh oh!

corona10 Jan 30, 2023

Uh oh!

Uh oh!

Uh oh!

iritkatriel left a comment

Uh oh!

miss-islington commented Jan 30, 2023

Uh oh!

miss-islington commented Jan 30, 2023

Uh oh!

miss-islington commented Jan 30, 2023

Uh oh!

corona10 commented Jan 30, 2023

Uh oh!

bedevere-bot commented Jan 31, 2023

Uh oh!

bedevere-bot commented Jan 31, 2023

Uh oh!

Uh oh!

Uh oh!

gh-101400: Fix incorrect lineno in exception message on continue/break which are not in a loop #101413

gh-101400: Fix incorrect lineno in exception message on continue/break which are not in a loop #101413

Uh oh!

Conversation

corona10 commented Jan 30, 2023 • edited by bedevere-bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

corona10 commented Jan 30, 2023

Without patch

Uh oh!

iritkatriel Jan 30, 2023

Choose a reason for hiding this comment

Uh oh!

corona10 Jan 30, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

iritkatriel left a comment

Choose a reason for hiding this comment

Uh oh!

miss-islington commented Jan 30, 2023

Uh oh!

miss-islington commented Jan 30, 2023

Uh oh!

miss-islington commented Jan 30, 2023

Uh oh!

corona10 commented Jan 30, 2023

Uh oh!

bedevere-bot commented Jan 31, 2023

Uh oh!

bedevere-bot commented Jan 31, 2023

Uh oh!

Uh oh!

corona10 commented Jan 30, 2023 •

edited by bedevere-bot

Loading