[3.9] gh-123270: Replaced SanitizedNames with a more surgical fix. (GH-123354)#123432

ambv merged 2 commits intopython:3.9python/cpython:3.9from

jaraco:backport-17b77bb-3.9jaraco/cpython:backport-17b77bb-3.9Copy head branch name to clipboard