Message 212418 - Python tracker

Can somebody backport the fixes for the test breakages to 3.1 and 3.2 please, it seems they were forgotten.

The original CVE fix includes changes to test_socket.py so I cant imagine security-only-fix policy applies.

Thanks!