Skip to content

bpo-44600: Pattern-matching: line-numbers incorrectly traced on default case#27346

Merged
brandtbucher merged 22 commits intopython:mainfrom
chaburkland:44600_matching_trace_bugfix
Jul 25, 2021
Merged

bpo-44600: Pattern-matching: line-numbers incorrectly traced on default case#27346
brandtbucher merged 22 commits intopython:mainfrom
chaburkland:44600_matching_trace_bugfix

Conversation

@chaburkland
Copy link
Copy Markdown
Contributor

@chaburkland chaburkland commented Jul 25, 2021 •
edited by bedevere-bot
Loading

The test cases added directly mirror the examples raised by @nedbat in the originally raised issue.

https://bugs.python.org/issue44600

chaburkland and others added 14 commits March 10, 2020 19:23
@chaburkland
Adds union & update operators to os.environ and os.environb
66878fa
@chaburkland
Adds name to Misc/ACKS
4f9c057
@brandtbucher
Update Lib/test/test_os.py
4b69c50 
Co-Authored-By: Brandt Bucher <brandtbucher@gmail.com>
@brandtbucher
Update Lib/test/test_os.py
c42d9d5 
Co-Authored-By: Brandt Bucher <brandtbucher@gmail.com>
@brandtbucher
Update Lib/test/test_os.py
399a122 
Co-Authored-By: Brandt Bucher <brandtbucher@gmail.com>
@chaburkland
Updates test keys to be UPPERCASE to support Windows.
adf2903
@chaburkland
Makes the type/purpose of 'expected' more explicit.
571a329
@chaburkland
Tests the underlying process environment is changing (or not changing…
4a2960a 
…) as expected.
@chaburkland
Removes accidentally added diff.diff file.
99826fe
@chaburkland
Removes some unnecessary/expensive tests
7a693ba
@chaburkland
Merge branch 'python:main' into master
923ba52
@chaburkland
Fixes issue where linenos were not being traced correctly. Adds line …
f745021 
…coverage for default case.
@chaburkland
Merge branch 'main' of github.com:python/cpython into 44600_matching_…
b4168d1 
…trace_bugfix
@chaburkland
Removes an accidentally added news file.
b1e4059
@chaburkland chaburkland requested a review from markshannon as a code owner July 25, 2021 04:42
@brandtbucher brandtbucher self-requested a review July 25, 2021 05:19
@brandtbucher brandtbucher added the needs backport to 3.10 only security fixes label Jul 25, 2021
brandtbucher
brandtbucher requested changes Jul 25, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@brandtbucher brandtbucher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @chaburkland! I've left some comments, but in general I really like your test framework here.

This PR should also have a NEWS entry. Just something simple, like:

Fix incorrect line numbers while tracing some failed patterns in :ref:`match <match>` statements. Patch by Charles Burkland.

@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Jul 25, 2021

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

And if you don't make the requested changes, you will be put in the comfy chair!

blurb-it bot and others added 7 commits July 25, 2021 20:04
@blurb-it
📜🤖 Added by blurb_it.
28f3733
@chaburkland @brandtbucher
Update Lib/test/test_patma.py
bc62a4f 
Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
@chaburkland @brandtbucher
Update Lib/test/test_patma.py
825949d 
Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
@chaburkland @brandtbucher
Update Lib/test/test_patma.py
7ab33d6 
Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
@chaburkland @brandtbucher
Update Lib/test/test_patma.py
7175743 
Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
@chaburkland @brandtbucher
Update Lib/test/test_patma.py
74187a6 
Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
@chaburkland @brandtbucher
Update Lib/test/test_patma.py
ef70148 
Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
@chaburkland
Copy link
Copy Markdown
Contributor Author

chaburkland commented Jul 25, 2021

I have made the requested changes; please review again

@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Jul 25, 2021

Thanks for making the requested changes!

@brandtbucher: please review the changes made to this pull request.

brandtbucher
brandtbucher approved these changes Jul 25, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@brandtbucher brandtbucher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@brandtbucher brandtbucher merged commit 4214f47 into python:main Jul 25, 2021
@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Jul 25, 2021

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

@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Jul 25, 2021

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

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Jul 25, 2021
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 25, 2021
@chaburkland @miss-islington
bpo-44600: Fix line numbers for pattern matching cleanup code (python…
eff6b59 
…GH-27346)

(cherry picked from commit 4214f47)

Co-authored-by: Charles Burkland <charles.aburkland@gmail.com>
miss-islington added a commit that referenced this pull request Jul 26, 2021
@miss-islington
[3.10] bpo-44600: Fix line numbers for pattern matching cleanup code (G…
01601aa 
…H-27346) (GH-27356)

(cherry picked from commit 4214f47)


Co-authored-by: Charles Burkland <charles.aburkland@gmail.com>

Automerge-Triggered-By: GH:brandtbucher
@chaburkland chaburkland deleted the 44600_matching_trace_bugfix branch July 26, 2021 01:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@brandtbucher brandtbucher brandtbucher approved these changes

@markshannon markshannon Awaiting requested review from markshannon markshannon is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@chaburkland @bedevere-bot @miss-islington @brandtbucher @the-knights-who-say-ni