]> granicus.if.org Git - python/commitdiff
merge 3.5
authorSenthil Kumaran <senthil@uthcode.com>
Mon, 25 Apr 2016 15:18:07 +0000 (08:18 -0700)
committerSenthil Kumaran <senthil@uthcode.com>
Mon, 25 Apr 2016 15:18:07 +0000 (08:18 -0700)
Issue #26804: urllib.request will prefer lower_case proxy environment variables
over UPPER_CASE or Mixed_Case ones.

Patch contributed by Hans-Peter Jansen. Reviewed by Martin Panter and Senthil Kumaran.

1  2 
Lib/urllib/request.py
Misc/ACKS
Misc/NEWS

Simple merge
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge