in test_urllib2.py file:

 test_osx_proxy_bypass (test.test_urllib2.HandlerTests)
# Check hosts that should not trigger the proxy bypass
 for host in ('abc.foo.bar', 'bar.com', '127.0.0.2', '10.11.0.1', 'test'):
        self.assertFalse(_proxy_bypass_macosx_sysconf(host, bypass),
                              'expected bypass of %s to be False' % host)

for host 'test' under some wifi conditions(University of Waterloo wifi)the socket.gethostbyname('test') returns localhost which is in the exceptions.

the assertion will fail.

this testcase should be modified or we add some condition before the assertion

modify the host 'test' name to a less general one 'testMacProxyBypass'

so it won't be DNS mapped to certain ip that happens to be in exceptions

New changeset 6a78bbd0fda4 by R David Murray in branch '3.3':
#20933: At least one place maps 'test' to 'localhost'...fix test.
http://hg.python.org/cpython/rev/6a78bbd0fda4

New changeset 586de8d96817 by R David Murray in branch 'default':
Merge: #20933: At least one place maps 'test' to 'localhost'...fix test.
http://hg.python.org/cpython/rev/586de8d96817

Fix looks good to me, thanks.  I changed the name to be a bit more descriptive, and wrapped the line to less than 80 characters.