summaryrefslogtreecommitdiffstats
path: root/Lib/urllib/request.py
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2010-06-27 12:52:17 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2010-06-27 12:52:17 (GMT)
commit536ad94edbd6e06eb7fbba9a57400ffbd03873d8 (patch)
tree4704d3bb77ead580d1acdde22035c201100180f2 /Lib/urllib/request.py
parenta75facfdc7f1d3595aa717cef43dbedef209d0e1 (diff)
downloadcpython-536ad94edbd6e06eb7fbba9a57400ffbd03873d8.zip
cpython-536ad94edbd6e06eb7fbba9a57400ffbd03873d8.tar.gz
cpython-536ad94edbd6e06eb7fbba9a57400ffbd03873d8.tar.bz2
Merged revisions 82281 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r82281 | ronald.oussoren | 2010-06-27 14:51:31 +0200 (Sun, 27 Jun 2010) | 19 lines 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 'Lib/urllib/request.py')
0 files changed, 0 insertions, 0 deletions