bpo-22087: Restructure code to be more robust and safe#7226

1st1 wants to merge 1 commit intopython:masterpython/cpython:masterfrom

1st1:fixfork21st1/cpython:fixfork2Copy head branch name to clipboard