traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge cleanup.

This commit is contained in:
Guido van Rossum 2011-03-29 13:04:24 -07:00
parent 07ef62c47c b7ef35b582
commit b885a5bbc8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/test/test_urllib2.py
View File

@ -977,6 +977,7 @@ class HandlerTests(unittest.TestCase):
h = urllib2.HTTPRedirectHandler()
o = h.parent = MockOpener()
req = Request(from_url)
req.timeout = socket._GLOBAL_DEFAULT_TIMEOUT
for scheme in invalid_schemes:
invalid_url = scheme + '://' + schemeless_url

6
Misc/NEWS
View File

@ -16,9 +16,6 @@ Core and Builtins
- Issue #11450: Don't truncate hg version info in Py_GetBuildInfo() when
there are many tags (e.g. when using mq). Patch by Nadeem Vawda.
- Issue #11662: Make urllib and urllib2 ignore redirections if the
scheme is not HTTP, HTTPS or FTP (CVE-2011-1521).
- Issue #10451: memoryview objects could allow to mutate a readable buffer.
Initial patch by Ross Lagerwall.
@ -50,6 +47,9 @@ Core and Builtins
Library
-------
- Issue #11662: Make urllib and urllib2 ignore redirections if the
scheme is not HTTP, HTTPS or FTP (CVE-2011-1521).
- Issue #11256: Fix inspect.getcallargs on functions that take only keyword
arguments.