Issue #28435: Merge urllib test fixes from 3.5 into 3.6

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

Sat, 22 Oct 2016 03:21:36 +0000 (03:21 +0000)

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

Sat, 22 Oct 2016 03:21:36 +0000 (03:21 +0000)
author Martin Panter <vadmium+py@gmail.com>
Sat, 22 Oct 2016 03:21:36 +0000 (03:21 +0000)
committer Martin Panter <vadmium+py@gmail.com>
Sat, 22 Oct 2016 03:21:36 +0000 (03:21 +0000)
diff --cc Lib/test/test_urllib2_localnet.py
Simple merge
diff --cc Misc/ACKS

index 25278367f69e160f4873a71f819f7dcb2ff3cd90,8c5c0c203ff06ff48729c3372e48d02ff485363a..f08719a30eed28a5f2d2137d701d18c9a631eaff
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -1473,9 -1450,9 +1473,10 @@@ Al Sweigar
   Thenault Sylvain
   Péter Szabó
   John Szakmeister
+ Piotr Szczepaniak
   Amir Szekely
   Maciej Szulik
+ +Joel Taddei
   Arfrever Frehtes Taifersar Arahesis
   Hideaki Takahashi
   Takase Arihiro
author	Martin Panter <vadmium+py@gmail.com>
	Sat, 22 Oct 2016 03:21:36 +0000 (03:21 +0000)
committer	Martin Panter <vadmium+py@gmail.com>
	Sat, 22 Oct 2016 03:21:36 +0000 (03:21 +0000)
		1	2
Lib/test/test_urllib2_localnet.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history