diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-12-03 19:59:41 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-12-03 19:59:41 (GMT) |
| commit | c4df7845143f9afe0d20f4421a41904f3cbb991a (patch) | |
| tree | f41b148eba51ce36c7d45aaa15625cc41d1786b9 /Modules/socketmodule.c | |
| parent | 500be24a64ff188b8cfcc1ad75d9b556bbf6ce86 (diff) | |
| download | cpython-c4df7845143f9afe0d20f4421a41904f3cbb991a.zip cpython-c4df7845143f9afe0d20f4421a41904f3cbb991a.tar.gz cpython-c4df7845143f9afe0d20f4421a41904f3cbb991a.tar.bz2 | |
Issue #10272: The ssl module now raises socket.timeout instead of a generic
SSLError on socket timeouts.
Diffstat (limited to 'Modules/socketmodule.c')
| -rw-r--r-- | Modules/socketmodule.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index e24bf54..abdd1b2 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -4358,6 +4358,7 @@ static PySocketModule_APIObject PySocketModuleAPI = { &sock_type, + NULL, NULL }; @@ -4425,6 +4426,7 @@ PyInit__socket(void) socket_error, NULL); if (socket_timeout == NULL) return NULL; + PySocketModuleAPI.timeout_error = socket_timeout; Py_INCREF(socket_timeout); PyModule_AddObject(m, "timeout", socket_timeout); Py_INCREF((PyObject *)&sock_type); |