Changeset efbd885d7c8e6cecb1c6fccc45f845249630e0e1

Timestamp:

06/29/07 02:39:46 (6 years ago)

Author:

dsmith <dsmith@…>

Children:

1c06490e971a413d37373d5eb89a236149e61a94

Parents:

cfb368e1db62670a62e73af5ee589e663e9dc999

git-author:

L. Donnie Smith <donnie.smith@…> (06/29/07 02:39:46)

git-committer:

dsmith <dsmith@…> (06/29/07 02:39:46)

Message:

supress wminput errors for nonexistent python plugins

git-svn-id: http://abstrakraft.org/cwiid/svn/trunk@133 918edb2d-ff29-0410-9de2-eb38e7f22bc7

Files:

• ChangeLog (modified) (1 diff)
• wminput/py_plugin.c (modified) (3 diffs)

ChangeLog

@@ -8 +8 @@
         wminput
         * rewrote ir_ptr plugin
+        * supress error for nonexistent python plugins
 
 2007-06-18 L. Donnie Smith <cwiid@abstrakraft.org>

wminput/py_plugin.c

@@ -16 +16 @@
  *
  *  ChangeLog:
+ *  2007-06-28 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * supress error for nonexistent python plugins
+ *
  *  2007-06-18 L. Donnie Smith <cwiid@abstrakraft.org>
  *  * revised error messages
@@ -201 +204 @@
         PyObject *handle, *info;
         PyObject *PyStr;
+        PyObject *PyErrType, *PyErr, *PyTraceback;
 
         if (!(PyStr = PyString_FromString(dir))) {
@@ -213 +217 @@
 
         if (!(handle = PyImport_ImportModule(plugin->name))) {
-                /* TODO: print only syntax errors, not "module not found errors" */
-                PyErr_Print();
+                /* ignore "module not found" errors in top level module */
+                PyErr_Fetch(&PyErrType, &PyErr, &PyTraceback);
+                PyErr_NormalizeException(&PyErrType, &PyErr, &PyTraceback);
+                if (PyErr_GivenExceptionMatches(PyErr, PyExc_ImportError) &&
+                  !PyTraceback) {
+                        Py_XDECREF(PyErrType);
+                        Py_XDECREF(PyErr);
+                }
+                else {
+                        PyErr_Restore(PyErrType, PyErr, PyTraceback);
+                        PyErr_Print();
+                }
+
                 if (PySequence_DelItem(PyPath, 0)) {
                         PyErr_Print();