summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2010-08-16 19:33:51 +0000
committerBarry Warsaw <barry@python.org>2010-08-16 19:33:51 +0000
commitb828e5c95781cff23c29bd46a38741220e6d712a (patch)
tree1b503ad74f01d17ff7a78b06d847428f71f309cf
parent29a66bdcb592173e5638c1b13439bad7beeeaaf7 (diff)
downloadcpython-git-b828e5c95781cff23c29bd46a38741220e6d712a.tar.gz
Issue 9568: Fix test_urllib2_localnet on OS X 10.3.
-rw-r--r--Mac/Modules/_scproxy.c2
-rw-r--r--Misc/NEWS6
2 files changed, 5 insertions, 3 deletions
diff --git a/Mac/Modules/_scproxy.c b/Mac/Modules/_scproxy.c
index b393fd14cc..4aa6665d13 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;
diff --git a/Misc/NEWS b/Misc/NEWS
index aa3247d9d1..a1ae4af265 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -4,8 +4,8 @@ Python News
(editors: check NEWS.help for information about editing NEWS using ReST.)
-What's New in Python 2.6.6?
-===========================
+What's New in Python 2.6.6 rc 2?
+================================
*Release date: XXXX-XX-XX*
@@ -26,6 +26,8 @@ Library
Extension Modules
-----------------
+- Issue #9568: Fix test_urllib2_localnet on OS X 10.3.
+
- Issue #7567: Don't call `setupterm' twice.
Tests