From: Senthil Kumaran <senthil@uthcode.com>
Date: Mon, 25 Apr 2016 15:18:07 +0000 (-0700)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~121
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0996fa3bd827e68eccf359823c8bc3518075abb4;p=thirdparty%2FPython%2Fcpython.git

merge 3.5

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.
---

0996fa3bd827e68eccf359823c8bc3518075abb4