From: Martin Panter <vadmium+py@gmail.com>
Date: Sat, 22 Oct 2016 03:21:36 +0000 (+0000)
Subject: Issue #28435: Merge urllib test fixes from 3.5 into 3.6
X-Git-Tag: v3.6.0b3~74
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85e81cfe9b51ff59a2065b5863d831ee7cb72b12;p=thirdparty%2FPython%2Fcpython.git

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

85e81cfe9b51ff59a2065b5863d831ee7cb72b12
diff --cc Misc/ACKS
index 25278367f69e,8c5c0c203ff0..f08719a30eed
--- a/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