@nascheme I thought the backport wouldn't apply cleanly, but here we are. Do you recall what was different about the 3.12 fix?

Please don't merge until the TraceRefs regression is fixed:#124865 (comment)

I think this can be merged now withGH-125709 applied on top or squashed into it.

@ericsnowcurrently, is this the way you'd do it in 3.12?

🤖 New build scheduled with the buildbot fleet by@encukou for commite9591b2 🤖

If you want to schedule another build, you need to add the🔨 test-with-buildbots label again.

The failed buildbots aren't applicable to 3.12, or fail for unrelated & pre-existing reasons.

@ericsnowcurrently, is this the way you'd do it in 3.12?

This should be good to go. It is backport ofgh-124865 +gh-125709. There shouldn't be anything particular to 3.12 that would need to be addressed differently.