(I got a merge conflict on this in urllib.request.rst, which makes no sense to
me.  Hopefully I didn't screw up the previous 3.3 commit.)