[Python-checkins] cpython (merge 3.5 -> default): Issue #27289: Merge from 3.5

Sun Jun 12 09:28:17 EDT 2016

https://hg.python.org/cpython/rev/fc0e8c7235f1
changeset: 101948:fc0e8c7235f1
parent: 101946:818a10534e44
parent: 101947:2e3a5770e5f6
user: Berker Peksag <berker.peksag at gmail.com>
date: Sun Jun 12 16:28:16 2016 +0300
summary:
 Issue #27289: Merge from 3.5
files:
 Lib/test/support/__init__.py | 3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -1351,7 +1351,8 @@
 500 <= err.code <= 599) or
 (isinstance(err, urllib.error.URLError) and
 (("ConnectionRefusedError" in err.reason) or
- ("TimeoutError" in err.reason))) or
+ ("TimeoutError" in err.reason) or
+ ("EOFError" in err.reason))) or
 n in captured_errnos):
 if not verbose:
 sys.stderr.write(denied.args[0] + "\n")
-- 
Repository URL: https://hg.python.org/cpython
