@serhiy-storchaka@scoder Can you review these with fresh eyes? I haven't necessarily attempted to address comments from the previous PR, but I want to make sure we at least have a separation of concerns.

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phraseI have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

The comments fromGH-5046 still apply.

I was hoping to get them fresh here to ensure that discussions didn't get conflated. (Note that I removed tests that would fail due to the other issues discussed in#5046 and elsewhere.)

@scoder Note that I explicitly did not include an issue number on this PR because it is not directly tied to any issue and does not resolve any open tickets. Rather, it is a prerequisite to my changes for bothbpo-32424 andbpo-36685.

I have made the requested changes; please review again.

Thanks for making the requested changes!

@scoder: please review the changes made to this pull request.

Thanks.

Thanks for sticking with this!