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

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

jaraco:backport-66d3383-3.8jaraco/cpython:backport-66d3383-3.8Copy head branch name to clipboard