Skip to content

gh-161233: Fix TypeError when timer=None was passed to cProfile.Profile - #161234

Merged
sobolevn merged 2 commits into
python:mainfrom
sobolevn:issue-161233
Nov 3, 2026
Merged

gh-161233: Fix TypeError when timer=None was passed to cProfile.Profile#161234
sobolevn merged 2 commits into
python:mainfrom
sobolevn:issue-161233

Conversation

@sobolevn

@sobolevn sobolevn commented Nov 3, 2026 •
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

@sobolevn
sobolevn requested a review from pablogsal as a code owner November 3, 2026 07:35
@bedevere-app bedevere-app Bot mentioned this pull request Nov 3, 2026
Closed
@sobolevn sobolevn added needs backport to 3.14 bugs and security fixes needs backport to 3.15 bugs and security fixes labels Nov 3, 2026
sergey-miryanov
sergey-miryanov approved these changes Nov 3, 2026
View reviewed changes

@sergey-miryanov sergey-miryanov left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM. One nitpick. I think it would be good to add assertion to the CallExternalTimer.

@sobolevn
sobolevn enabled auto-merge (squash) November 3, 2026 07:48
@sobolevn
sobolevn merged commit e9c9a33 into python:main Nov 3, 2026
56 checks passed
@miss-islington-app

miss-islington-app Bot commented Nov 3, 2026

Copy link
Copy Markdown

Thanks @sobolevn for the PR 🌮🎉.. I'm working now to backport this PR to: 3.14, 3.15.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Nov 3, 2026

Copy link
Copy Markdown

Sorry, @sobolevn, I could not cleanly backport this to 3.14 due to a conflict.

Please backport manually with cherry_picker, see the devguide for more information.

cherry_picker e9c9a339035c9b96a5ebca8337a13140725ecf2a 3.14

@bedevere-app

bedevere-app Bot commented Nov 3, 2026

Copy link
Copy Markdown

GH-161237 is a backport of this pull request to the 3.15 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.15 bugs and security fixes label Nov 3, 2026
@bedevere-app

bedevere-app Bot commented Nov 3, 2026

Copy link
Copy Markdown

GH-161239 is a backport of this pull request to the 3.14 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.14 bugs and security fixes label Nov 3, 2026
sobolevn added a commit that referenced this pull request Nov 3, 2026
@miss-islington @sobolevn
[3.15] gh-161233: Fix TypeError when timer=None was passed to `cP…
98655da 
…rofile.Profile` (GH-161234) (#161237)

gh-161233: Fix `TypeError` when `timer=None` was passed to `cProfile.Profile` (GH-161234)
(cherry picked from commit e9c9a33)

Co-authored-by: sobolevn <mail@sobolevn.me>
sobolevn added a commit that referenced this pull request Nov 3, 2026
@sobolevn
[3.14] gh-161233: Fix TypeError when timer=None was passed to `cP…
e875c0a 
…rofile.Profile` (GH-161234) (#161239)

* [3.14] gh-161233: Fix `TypeError` when `timer=None` was passed to `cProfile.Profile` (GH-161234)
(cherry picked from commit e9c9a33)

Co-authored-by: sobolevn <mail@sobolevn.me>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sergey-miryanov sergey-miryanov sergey-miryanov approved these changes
@pablogsal pablogsal Awaiting requested review from pablogsal pablogsal is a code owner
@gaogaotiantian gaogaotiantian Awaiting requested review from gaogaotiantian

Assignees

@sobolevn sobolevn

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sobolevn @sergey-miryanov