[Python-checkins] cpython (merge 3.4 -> default): Issue #22289: merge from 3.4

[ned.deily]

https://hg.python.org/cpython/rev/1aad901e0307
changeset:   95122:1aad901e0307
parent:      95120:9202ea0b1bb8
parent:      95121:9eb1ce7d8039
user:        Ned Deily <nad at acm.org>
date:        Sun Mar 22 01:19:10 2015 -0700
summary:
  Issue #22289: merge from 3.4

files:
  Lib/test/support/__init__.py |  3 ++-
  Misc/NEWS                    |  5 +++++
  2 files changed, 7 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
@@ -1328,7 +1328,8 @@
             (isinstance(err, urllib.error.HTTPError) and
              500 <= err.code <= 599) or
             (isinstance(err, urllib.error.URLError) and
-             "ConnectionRefusedError" in err.reason) or
+                 (("ConnectionRefusedError" in err.reason) or
+                  ("TimeoutError" in err.reason))) or
             n in captured_errnos):
             if not verbose:
                 sys.stderr.write(denied.args[0] + "\n")
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -104,6 +104,11 @@
 
 - Issue #23585: make patchcheck will ensure the interpreter is built.
 
+Tests
+-----
+
+- Issue #22289: Prevent test_urllib2net failures due to ftp connection timeout.
+
 Tools/Demos
 -----------
 

-- 
Repository URL: https://hg.python.org/cpython