psuedo merge: #22797: clarify when URLErrors are raised by urlopen.

I'm not sure how my previous merge commit got screwed up, hopefully this
one will do the right thing.
1 file changed