summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-06-07 22:09:36 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-06-07 22:09:36 (GMT)
commitedb07d28fbfd526f0771b337b05c2e611d266981 (patch)
treef6918e3ba213ced7e984d0e0f9585ba84ac8647e /Misc
parent8dfd73a2b42917b07698f446e20ab296fdfe0ef2 (diff)
parent3c2dca67ac9cdc26fb02473e05723486ffc8d52b (diff)
downloadcpython-edb07d28fbfd526f0771b337b05c2e611d266981.zip
cpython-edb07d28fbfd526f0771b337b05c2e611d266981.tar.gz
cpython-edb07d28fbfd526f0771b337b05c2e611d266981.tar.bz2
merge 3.4 (#21463)
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index fe894b3..7a5860a 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -32,6 +32,7 @@ Fred Allen
Ray Allen
Billy G. Allie
Kevin Altis
+Skyler Leigh Amador
Joe Amenta
A. Amoroso
Mark Anacker
diff --git a/Misc/NEWS b/Misc/NEWS
index 62c1be0..d13d573 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -94,6 +94,8 @@ Library
- Issue #21515: tempfile.TemporaryFile now uses os.O_TMPFILE flag is available.
+- Issue #21463: In urllib.request, fix pruning of the FTP cache.
+
- Issue #21618: The subprocess module could fail to close open fds that were
inherited by the calling process and already higher than POSIX resource
limits would otherwise allow. On systems with a functioning /proc/self/fd