Issue #12923: Merge FancyURLopener fix from 3.5

author Martin Panter <vadmium+py@gmail.com>

Sat, 6 Feb 2016 01:08:40 +0000 (01:08 +0000)

committer Martin Panter <vadmium+py@gmail.com>

Sat, 6 Feb 2016 01:08:40 +0000 (01:08 +0000)
author Martin Panter <vadmium+py@gmail.com>
Sat, 6 Feb 2016 01:08:40 +0000 (01:08 +0000)
committer Martin Panter <vadmium+py@gmail.com>
Sat, 6 Feb 2016 01:08:40 +0000 (01:08 +0000)
diff --cc Lib/urllib/request.py
Simple merge
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Martin Panter <vadmium+py@gmail.com>
	Sat, 6 Feb 2016 01:08:40 +0000 (01:08 +0000)
committer	Martin Panter <vadmium+py@gmail.com>
	Sat, 6 Feb 2016 01:08:40 +0000 (01:08 +0000)
		1	2
Lib/urllib/request.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history