Skip to content

Commit 03b72c6

Browse files
committed
Fix for CONPY-240:
Don't overwrite errormessage/stacktrace if an exception was generated during module initialization.
1 parent 952a8cf commit 03b72c6

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

mariadb/mariadb.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ PyMODINIT_FUNC PyInit__mariadb(void)
109109

110110
/* Import Decimal support (CONPY-49) */
111111
if (!(decimal_module= PyImport_ImportModule("decimal")) ||
112-
!(decimal_type= PyObject_GetAttrString(decimal_module, "Decimal")))
112+
!(decimal_type= PyObject_GetAttr(decimal_module, PyUnicode_FromString("Decimal"))))
113113
{
114114
goto error;
115115
}
@@ -173,10 +173,7 @@ PyMODINIT_FUNC PyInit__mariadb(void)
173173
error:
174174
if (PyErr_Occurred())
175175
{
176-
PyObject *type,*value, *traceback;
177-
178-
PyErr_Fetch(&type, &value, &traceback);
179-
return PyErr_Format(PyExc_ImportError, "MariaDB module initialization failed: %s\n", PyUnicode_AsUTF8(value));
176+
return NULL;
180177
}
181178
PyErr_SetString(PyExc_ImportError, "Mariadb module initialization failed.");
182179
return NULL;

0 commit comments

Comments
 (0)