Clear error if wxPyConvertSwigPtr failed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i
index 225f899087d47454bc9de6f424c1edfb7c0c98e0..4b63e19d071de61d5ee54bfa421444512827cc24 100644 (file)
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -593,6 +593,7 @@ public:
                     rval = *ptr;
                 }
                 else if (PySequence_Check(ro) && PyObject_Length(ro) == 2) {
                     rval = *ptr;
                 }
                 else if (PySequence_Check(ro) && PyObject_Length(ro) == 2) {

+                    PyErr_Clear();  // Clear the exception left over from wxPyConvertSwigPtr

                     PyObject* o1 = PySequence_GetItem(ro, 0);
                     PyObject* o2 = PySequence_GetItem(ro, 1);
                     if (PyNumber_Check(o1) && PyNumber_Check(o2))
                     PyObject* o1 = PySequence_GetItem(ro, 0);
                     PyObject* o2 = PySequence_GetItem(ro, 1);
                     if (PyNumber_Check(o1) && PyNumber_Check(o2))