summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-11-10 23:59:44 (GMT)
committerJason R. Coombs <jaraco@jaraco.com>2013-11-10 23:59:44 (GMT)
commit0048ae0cc62cba45b197976031f0680d90687ffc (patch)
treeed3b3568ed4f4d8f9d4ceeb86d6fb15dea327451 /Misc
parent375dc9b8b42cd9a8b98679c751dc859620956be3 (diff)
parenta2ebfd02566d6ec929e75bfadaadd250314d9a20 (diff)
downloadcpython-0048ae0cc62cba45b197976031f0680d90687ffc.zip
cpython-0048ae0cc62cba45b197976031f0680d90687ffc.tar.gz
cpython-0048ae0cc62cba45b197976031f0680d90687ffc.tar.bz2
Merge with 3.3 for Issue #19544 and Issue #6286. Merge is untested. I was unable to test due to bab0cbf86835.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS4
1 files changed, 4 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index fef9e62..563c7fe 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -34,6 +34,10 @@ Core and Builtins
Library
-------
+- Issue #19544 and Issue #6286: Restore use of urllib over http allowing use
+ of http_proxy for Distutils upload command, a feature accidentally lost
+ in the rollback of distutils2.
+
- Issue #19544 and Issue #7457: Restore the read_pkg_file method to
distutils.dist.DistributionMetadata accidentally removed in the undo of
distutils2.