]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge from 3.2 - Fix closes issue12698 - make the no_proxy environment variable handl...
authorSenthil Kumaran <senthil@uthcode.com>
Sat, 6 Aug 2011 04:28:16 +0000 (12:28 +0800)
committerSenthil Kumaran <senthil@uthcode.com>
Sat, 6 Aug 2011 04:28:16 +0000 (12:28 +0800)
1  2 
Lib/test/test_urllib.py
Lib/urllib/request.py

Simple merge
Simple merge