[Python-checkins] cpython: Issue #18408: Fix time.tzset(), detect exception when calling PyInit_timezone()

victor.stinner python-checkins at python.org
Wed Jul 17 22:11:49 CEST 2013


http://hg.python.org/cpython/rev/4d3bb9763bf9
changeset:   84690:4d3bb9763bf9
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Wed Jul 17 21:42:45 2013 +0200
summary:
  Issue #18408: Fix time.tzset(), detect exception when calling PyInit_timezone()

files:
  Modules/timemodule.c |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Modules/timemodule.c b/Modules/timemodule.c
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -851,6 +851,8 @@
     /* Reset timezone, altzone, daylight and tzname */
     PyInit_timezone(m);
     Py_DECREF(m);
+    if (PyErr_Occurred())
+        return NULL;
 
     Py_INCREF(Py_None);
     return Py_None;

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list