From 2ff51b83b88b65818479706f2d5238c52bbae296 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 17 Jul 2013 21:42:45 +0200
Subject: [PATCH] Issue #18408: Fix time.tzset(), detect exception when calling
 PyInit_timezone()

---
 Modules/timemodule.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 297467f730..2c3341cc1a 100644
--- 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;
-- 
2.50.1