summaryrefslogtreecommitdiffstats
path: root/Modules/_scproxy.c
Commit message (Collapse)AuthorAgeFilesLines
* Merged revisions 82150 via svnmerge fromRonald Oussoren2010-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | 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). ........
* Recorded merge of revisions 81029 via svnmerge fromAntoine Pitrou2010-05-091-202/+202
| | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines Untabify C files. Will watch buildbots. ........
* For for issue #7154: Port the code that usesRonald Oussoren2010-04-181-0/+261
the SystemConfiguration framework to detect the proxy settings on OSX from the trunk to python 3.2