[issue35890] Cleanup some non-consistent API callings

[Steve Dower]

Change by Steve Dower <steve.dower at python.org>:


----------
pull_requests: +19491
pull_request: https://github.com/python/cpython/pull/20190

_______________________________________
Python tracker <report at bugs.python.org>
<https://bugs.python.org/issue35890>
_______________________________________