Issue #18408: Fix time.tzset(), detect exception when calling PyInit_timezone()

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 297467f7309248a32751b1bb7bec758726d4de09..2c3341cc1a693ad76855da4ea5471f4a8cd8c9de 100644 (file)
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -851,6 +851,8 @@ time_tzset(PyObject *self, PyObject *unused)
     /* Reset timezone, altzone, daylight and tzname */
     PyInit_timezone(m);
     Py_DECREF(m);
+    if (PyErr_Occurred())
+        return NULL;
 
     Py_INCREF(Py_None);
     return Py_None;