Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bpo-28528: Fix pdb.checkline() attribute error when 'curframe' is None. #25438

Merged
merged 10 commits into from May 11, 2021

Conversation

@erlend-aasland
Copy link
Contributor

@erlend-aasland erlend-aasland commented Apr 16, 2021

Test case copied from Kluyver's patch in the issue.

Co-authored-by: Thomas Kluyver takowl@gmail.com

https://bugs.python.org/issue28528

@erlend-aasland
Copy link
Contributor Author

@erlend-aasland erlend-aasland commented Apr 28, 2021

@iritkatriel would you mind reviewing this?

Lib/pdb.py Outdated Show resolved Hide resolved
Lib/test/test_pdb.py Outdated Show resolved Hide resolved
erlend-aasland and others added 3 commits Apr 28, 2021
Test case C&P from T. Kluyver's patch.

Co-written-by: Thomas Kluyver <takowl@gmail.com>
Co-authored-by: Irit Katriel <iritkatriel@yahoo.com>
@erlend-aasland
Copy link
Contributor Author

@erlend-aasland erlend-aasland commented Apr 28, 2021

OMG, sorry 'bout the spurious review requests, everyone! I just did a rebase on to master and a force push; I didn't expect this noise. Sorry again!

@erlend-aasland erlend-aasland removed request for Apr 28, 2021
Copy link
Member

@iritkatriel iritkatriel left a comment

A few nits.

Lib/pdb.py Outdated Show resolved Hide resolved
@iritkatriel iritkatriel changed the title bpo-28528: Harden pdb.checkline() bpo-28528: Fix pdb.checkline() attribute error when 'curframe' is missing. May 11, 2021
erlend-aasland and others added 3 commits May 11, 2021
Co-authored-by: Irit Katriel <iritkatriel@yahoo.com>
Co-authored-by: Irit Katriel <iritkatriel@yahoo.com>
@iritkatriel
Copy link
Member

@iritkatriel iritkatriel commented May 11, 2021

LGTM

@erlend-aasland
Copy link
Contributor Author

@erlend-aasland erlend-aasland commented May 11, 2021

LGTM

Thanks for reviewing again, Irit!

@iritkatriel iritkatriel changed the title bpo-28528: Fix pdb.checkline() attribute error when 'curframe' is missing. bpo-28528: Fix pdb.checkline() attribute error when 'curframe' is None. May 11, 2021
@iritkatriel iritkatriel merged commit 8563a70 into python:main May 11, 2021
12 checks passed
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented May 11, 2021

Thanks @erlend-aasland for the PR, and @iritkatriel for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10, 3.9.
🐍🍒🤖

@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented May 11, 2021

@iritkatriel: Please replace # with GH- in the commit message next time. Thanks!

@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented May 11, 2021

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

miss-islington added a commit to miss-islington/cpython that referenced this issue May 11, 2021
…e. (pythonGH-25438)

Co-authored-by: Thomas Kluyver <takowl@gmail.com>
(cherry picked from commit 8563a70)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented May 11, 2021

GH-26051 is a backport of this pull request to the 3.9 branch.

miss-islington added a commit to miss-islington/cpython that referenced this issue May 11, 2021
…e. (pythonGH-25438)

Co-authored-by: Thomas Kluyver <takowl@gmail.com>
(cherry picked from commit 8563a70)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
iritkatriel pushed a commit that referenced this issue May 11, 2021
…e. (GH-25438) (#26050)

Co-authored-by: Thomas Kluyver <takowl@gmail.com>
(cherry picked from commit 8563a70)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
@erlend-aasland erlend-aasland deleted the bpo-28528 branch May 12, 2021
erlend-aasland added a commit to erlend-aasland/cpython that referenced this issue May 12, 2021
…is None. (pythonGH-25438)

Co-authored-by: Thomas Kluyver <takowl@gmail.com>
(cherry picked from commit 8563a70)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
erlend-aasland added a commit to erlend-aasland/cpython that referenced this issue May 12, 2021
…is None. (pythonGH-25438)

Co-authored-by: Thomas Kluyver <takowl@gmail.com>
(cherry picked from commit 8563a70)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
miss-islington pushed a commit that referenced this issue May 12, 2021
…is None (GH-25438) (GH-26053)

Co-authored-by: Thomas Kluyver <takowl@gmail.com>
(cherry picked from commit 8563a70)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>

Automerge-Triggered-By: GH:iritkatriel
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants