Issue #28435: Merge urllib test fixes from 3.5 into 3.6