Issue #22289: merge from 3.4

Lib/test/support/__init__.py

@@ -1328,7 +1328,8 @@ def transient_internet(resource_name, *, timeout=30.0, errnos=()):
             (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")

Misc/NEWS

@@ -104,6 +104,11 @@ Build
 
 - Issue #23585: make patchcheck will ensure the interpreter is built.
 
+Tests
+-----
+
+- Issue #22289: Prevent test_urllib2net failures due to ftp connection timeout.
+
 Tools/Demos
 -----------