3 Commits

Author	SHA1	Message	Date
Ronald Oussoren	536ad94edb	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). ........ ................	2010-06-27 12:52:17 +00:00
Antoine Pitrou	7f14f0d8a0	Recorded merge of revisions 81032 via svnmerge from ... svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r81032 | antoine.pitrou | 2010-05-09 17:52:27 +0200 (dim., 09 mai 2010) | 9 lines Recorded merge of revisions 81029 via svnmerge from 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. ........ ................	2010-05-09 16:14:21 +00:00
Ronald Oussoren	218cc58d08	Merged revisions 80198 via svnmerge from ... svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r80198 | ronald.oussoren | 2010-04-18 22:46:11 +0200 (Sun, 18 Apr 2010) | 4 lines For for issue #7154: Port the code that uses the SystemConfiguration framework to detect the proxy settings on OSX from the trunk to python 3.2 ........	2010-04-18 20:49:34 +00:00