From: Senthil Kumaran <senthil@uthcode.com>
Date: Mon, 14 Apr 2014 20:33:21 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1880
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dfb2375b813fbf6f1bdd0f428fca041b2f84f00a;p=thirdparty%2FPython%2Fcpython.git

merge 3.4

Convert urllib.request parse_proxy doctests to unittests.
---

dfb2375b813fbf6f1bdd0f428fca041b2f84f00a