From c8a82c060166e625c005b293705071490db3ab1c Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 23 Sep 2017 19:17:23 -0700 Subject: [PATCH] Clear potential prior error state --- src/wxpy_api.sip | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/wxpy_api.sip b/src/wxpy_api.sip index a3a60e63..d97d7861 100644 --- a/src/wxpy_api.sip +++ b/src/wxpy_api.sip @@ -32,6 +32,7 @@ static wxString i_Py2wxString(PyObject* source) #if wxUSE_UNICODE_WCHAR == 0 #error wxString converison can only handle WCHAR wxStrings currently #endif + PyErr_Clear(); PyObject* uni = source; if (PyBytes_Check(source)) { // if it's a string object convert it to unicode first, assumes utf-8 @@ -283,6 +284,8 @@ wxVariant i_wxVariant_in_helper(PyObject* obj) { wxVariant value; + PyErr_Clear(); + if (PyBytes_Check(obj) || PyUnicode_Check(obj)) value = Py2wxString(obj);