diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-09-28 14:43:59 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-09-28 14:43:59 (GMT) |
| commit | 8928e32cb0090bb3694de92e0dd417e738a9b9ec (patch) | |
| tree | 8bb5bc49c53a478177d0f90887168fc33c95aa2c | |
| parent | ec2fe0063943b810e5a1b41282e79c49597637a0 (diff) | |
| download | cpython-8928e32cb0090bb3694de92e0dd417e738a9b9ec.zip cpython-8928e32cb0090bb3694de92e0dd417e738a9b9ec.tar.gz cpython-8928e32cb0090bb3694de92e0dd417e738a9b9ec.tar.bz2 | |
Merged revisions 85062 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r85062 | ronald.oussoren | 2010-09-28 16:38:31 +0200 (Tue, 28 Sep 2010) | 3 lines
Fix for issue #9568.
........
| -rw-r--r-- | Mac/Modules/_scproxy.c | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Mac/Modules/_scproxy.c b/Mac/Modules/_scproxy.c index b393fd1..4aa6665 100644 --- a/Mac/Modules/_scproxy.c +++ b/Mac/Modules/_scproxy.c @@ -73,7 +73,7 @@ get_proxy_settings(PyObject* mod __attribute__((__unused__))) v = PyBool_FromLong(cfnum_to_int32(aNum)); } } else { - v = PyBool_FromLong(1); + v = PyBool_FromLong(0); } if (v == NULL) goto error; @@ -405,6 +405,8 @@ Tests - Issue #8605: Skip test_gdb if Python is compiled with optimizations. +- Issue #9568: Fix test_urllib2_localnet on OS X 10.3. + Documentation ------------- |