summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-02-06 01:08:40 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-02-06 01:08:40 (GMT)
commita3643c280f7ed819d2caaa52cb0094a8f2267000 (patch)
tree4f5d41959d2148414552bf03a784b3fd8f9c39c9 /Misc
parentab8d4fba6d0657420b53b2988cf3810c3f2ace67 (diff)
parenta03702252f591e477db0576bea589d21afdfa601 (diff)
downloadcpython-a3643c280f7ed819d2caaa52cb0094a8f2267000.zip
cpython-a3643c280f7ed819d2caaa52cb0094a8f2267000.tar.gz
cpython-a3643c280f7ed819d2caaa52cb0094a8f2267000.tar.bz2
Issue #12923: Merge FancyURLopener fix from 3.5
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 0993f05..3279e46 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1218,6 +1218,7 @@ Ben Roberts
Mark Roberts
Andy Robinson
Jim Robinson
+Daniel Rocco
Mark Roddy
Kevin Rodgers
Sean Rodman
diff --git a/Misc/NEWS b/Misc/NEWS
index 60ea2da..dcccc4a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -169,6 +169,9 @@ Core and Builtins
Library
-------
+- Issue #12923: Reset FancyURLopener's redirect counter even if there is an
+ exception. Based on patches by Brian Brazil and Daniel Rocco.
+
- Issue #25945: Fixed a crash when unpickle the functools.partial object with
wrong state. Fixed a leak in failed functools.partial constructor.
"args" and "keywords" attributes of functools.partial have now always types