Skip to content

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

Merged
iritkatriel merged 10 commits into
python:mainfrom
erlend-aasland:bpo-28528
May 11, 2021
Merged

bpo-28528: Fix pdb.checkline() attribute error when 'curframe' is None.#25438
iritkatriel merged 10 commits into
python:mainfrom
erlend-aasland:bpo-28528

Conversation

@erlend-aasland

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

Copy link
Copy Markdown
Contributor

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
Copy Markdown
Contributor Author

@iritkatriel would you mind reviewing this?

Comment thread Lib/pdb.py Outdated
Comment thread Lib/test/test_pdb.py Outdated
Erlend E. Aasland and others added 3 commits April 28, 2021 23:47
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
Copy Markdown
Contributor Author

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 a team April 28, 2021 21:50

@iritkatriel iritkatriel left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

A few nits.

Comment thread Misc/NEWS.d/next/Library/2021-04-29-00-48-00.bpo-28528.JLAVWj.rst Outdated
Comment thread Misc/NEWS.d/next/Library/2021-04-29-00-48-00.bpo-28528.JLAVWj.rst Outdated
Comment thread Lib/pdb.py Outdated
@iritkatriel iritkatriel changed the title bpo-28528: Harden pdb.checkline() bpo-28528: Fix pdb.checkline() attribute error when 'curframe' is missing. May 11, 2021
@iritkatriel iritkatriel added the type-bug An unexpected behavior, bug, or error label May 11, 2021
Erlend Egeberg Aasland and others added 3 commits May 11, 2021 23:57
Co-authored-by: Irit Katriel <iritkatriel@yahoo.com>
Co-authored-by: Irit Katriel <iritkatriel@yahoo.com>
@iritkatriel

Copy link
Copy Markdown
Member

LGTM

@erlend-aasland

Copy link
Copy Markdown
Contributor Author

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
@miss-islington

Copy link
Copy Markdown
Contributor

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
Copy Markdown

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

@bedevere-bot

Copy link
Copy Markdown

GH-26050 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 May 11, 2021
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request 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
Copy Markdown

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request 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 pull request 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 04:54
erlend-aasland pushed a commit to erlend-aasland/cpython that referenced this pull request 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 pull request 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

Labels

type-bug An unexpected behavior, bug, or error

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants