gh-140748: socket_helper.transient_internet: Unwrap UrlError.__cause__ (GH-140749)

encukou · web-flow · commit 75a1cbdd38b1 · 2025-10-30T12:14:17.000+01:00
diff --git a/Lib/test/support/socket_helper.py b/Lib/test/support/socket_helper.py
@@ -259,6 +259,10 @@ def filter_error(err):
             #        raise OSError('socket error', msg) from msg
             elif len(a) >= 2 and isinstance(a[1], OSError):
                 err = a[1]
+            # The error can also be wrapped as __cause__:
+            #    raise URLError(f"ftp error: {exp}") from exp
+            elif isinstance(err, urllib.error.URLError) and err.__cause__:
+                err = err.__cause__
             else:
                 break
         filter_error(err)
