Skip to content

gh-103225: Fixed zero lineno issue for pdb - #103265

Merged
iritkatriel merged 3 commits into
python:mainfrom
gaogaotiantian:pdb-line-number
Apr 7, 2023
Merged

gh-103225: Fixed zero lineno issue for pdb#103265
iritkatriel merged 3 commits into
python:mainfrom
gaogaotiantian:pdb-line-number

Conversation

@gaogaotiantian

@gaogaotiantiangaogaotiantian commented Apr 5, 2023•
edited by iritkatriel
Loading

Copy link
Copy Markdown
Member

According to #103225, inspect.getsourcelines() returns wrong line number. Fixing it it inspect will take extra discussion so we fixed it in pdb for now. If in the future this got fixed in inspect we can take the fix away.

Co-authored-by: Artem Mukhin ortem00@gmail.com

@bedevere-botbedevere-bot mentioned this pull request Apr 5, 2023
Closed
@arhadthedevarhadthedev added the stdlib Standard Library Python modules in the Lib/ directory label Apr 5, 2023
@artemmukhin

artemmukhin commented Apr 5, 2023

Copy link
Copy Markdown
Contributor

Sure! Thank you for extracting the workaround and the test for pdb into a separate PR.

Regarding adding co-authors, this article might be helpful. But that is fine anyway 🙂

@gaogaotiantian@artemmukhin
Fixed zero lineno issue for pdb
0b3c3b8
Co-authored-by: Artem Mukhin <ortem00@gmail.com>
@gaogaotiantian

gaogaotiantian commented Apr 5, 2023

Copy link
Copy Markdown
MemberAuthor

Sure! Thank you for extracting the workaround and the test for pdb into a separate PR.

Regarding adding co-authors, this article might be helpful. But that is fine anyway 🙂

Thanks! That's helpful!

@gaogaotiantian

gaogaotiantian commented Apr 6, 2023

Copy link
Copy Markdown
MemberAuthor

@iritkatriel could you take a look at this fix which originally was done in inspect#103226

iritkatriel
iritkatriel reviewed Apr 6, 2023
View reviewed changes
Comment threadLib/pdb.py Outdated
iritkatriel
iritkatriel reviewed Apr 6, 2023
View reviewed changes
Comment threadLib/pdb.py Outdated
iritkatriel
iritkatriel reviewed Apr 6, 2023
View reviewed changes
Comment threadMisc/NEWS.d/next/Library/2023-04-05-01-28-53.gh-issue-103225.QD3JVU.rst Outdated
@iritkatriel

iritkatriel commented Apr 6, 2023

Copy link
Copy Markdown
Member

I've added the "co-authored by" line to the first comment.

@gaogaotiantian

gaogaotiantian commented Apr 6, 2023

Copy link
Copy Markdown
MemberAuthor

I've added the "co-authored by" line to the first comment.

I redid the commit with co-authored-by so @ortem is showing as the co-author in the commit now.

@gaogaotiantian@iritkatriel
Update Misc/NEWS.d/next/Library/2023-04-05-01-28-53.gh-issue-103225.Q…
b157545
…D3JVU.rst
Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
@iritkatriel

iritkatriel commented Apr 6, 2023

Copy link
Copy Markdown
Member

I’m not sure that would work, because we squash the commits when merging and typically remove the individual commit messages. It does get picked up from the description of the PR though.

@gaogaotiantian

gaogaotiantian commented Apr 6, 2023

Copy link
Copy Markdown
MemberAuthor

Hmm, interesting to know that. Next time I'll do it in the PR.

@iritkatriel
iritkatriel merged commit 2667452 into python:mainApr 7, 2023
@iritkatriel

iritkatriel commented Apr 7, 2023

Copy link
Copy Markdown
Member

Hmm, interesting to know that. Next time I'll do it in the PR.

Actually I think more accurately - GitHub probably picks up the coauthor from the commit message, but the person who merges typically deletes all the individual commit messages, and is more likely to notice the "co-authored by" in the main message and not erase it.

@gaogaotiantian
gaogaotiantian deleted the pdb-line-number branch April 8, 2023 04:37
warsaw pushed a commit to warsaw/cpython that referenced this pull request Apr 11, 2023
@gaogaotiantian@warsaw
pythongh-103225: Fixed zero lineno issue for pdb (python#103265)
b119d39
Co-authored-by: Artem Mukhin <ortem00@gmail.com>
@gaogaotiantian

gaogaotiantian commented May 5, 2023

Copy link
Copy Markdown
MemberAuthor

@iritkatriel should we port this back to 3.11?

@gaogaotiantiangaogaotiantian mentioned this pull request May 5, 2023
Closed
@iritkatriel

iritkatriel commented May 6, 2023

Copy link
Copy Markdown
Member

@iritkatriel should we port this back to 3.11?

We could, if this bug is there as well. Could you check to make sure, and then make a PR for 3.11?

gaogaotiantian added a commit to gaogaotiantian/cpython that referenced this pull request May 7, 2023
@gaogaotiantian@artemmukhin
pythongh-103225: Fixed zero lineno issue for pdb (python#103265)
c1254e4
Co-authored-by: Artem Mukhin <ortem00@gmail.com>
@bedevere-bot

bedevere-bot commented May 7, 2023

Copy link
Copy Markdown

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

@gaogaotiantian

gaogaotiantian commented May 7, 2023

Copy link
Copy Markdown
MemberAuthor

@iritkatriel should we port this back to 3.11?

We could, if this bug is there as well. Could you check to make sure, and then make a PR for 3.11?

Confirmed that 3.11 has this issue as well, PR was made.

@iritkatrieliritkatriel mentioned this pull request May 7, 2023
Merged
iritkatriel pushed a commit that referenced this pull request May 7, 2023
@gaogaotiantian@artemmukhin
[3.11]gh-103225: Fixed zero lineno issue for pdb (#103265) (#104262)
19abf69
gh-103225: Fixed zero lineno issue for pdb (#103265)
Co-authored-by: Artem Mukhin <ortem00@gmail.com>
@George-OgdenGeorge-Ogden mentioned this pull request Jul 20, 2025
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@iritkatrieliritkatrieliritkatriel approved these changes
+1 more reviewer
@artemmukhinartemmukhinartemmukhin left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

stdlibStandard Library Python modules in the Lib/ directory

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@gaogaotiantian@artemmukhin@iritkatriel@bedevere-bot@arhadthedev