summaryrefslogtreecommitdiffstats
path: root/Python/dynamic_annotations.c
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2010-06-27 12:51:31 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2010-06-27 12:51:31 (GMT)
commit7adeed324c001e74f9509bf52ba002c1fe1efaca (patch)
tree7bf11438386871f53029000de4fa33574f379f38 /Python/dynamic_annotations.c
parent0f377a53a5e9aaee46db2adaa1dd2f2d3723ce53 (diff)
downloadcpython-7adeed324c001e74f9509bf52ba002c1fe1efaca.zip
cpython-7adeed324c001e74f9509bf52ba002c1fe1efaca.tar.gz
cpython-7adeed324c001e74f9509bf52ba002c1fe1efaca.tar.bz2
Merged revisions 82150 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r82150 | ronald.oussoren | 2010-06-22 11:32:22 +0200 (Tue, 22 Jun 2010) | 12 lines The code in _scproxy (a mac specific helper module to detect proxy settings) had the wrong logic for detecting if the checkbox 'Exclude simple hostnames' is checked. This checkin fixes that. As a result the test failure 'Issue8455' goes away on systems where the checkbox is not checked. I'm carefully avoiding saying that is fixes that issue, test_urllib2_localnet assumes that system proxy settings are empty (not just on OSX, see Issue8455 for details). ........
Diffstat (limited to 'Python/dynamic_annotations.c')
0 files changed, 0 insertions, 0 deletions