From: Leo Singer <lsinger@calltech.edu>
Date: Mon, 30 Aug 2010 09:57:07 +0000 (+0200)
Subject: plugin: fix spurious exceptions in pygst_require. Fixes #624592.
X-Git-Tag: 1.19.3~485^2~346
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c31e12c5eccf74415ccdc643affa5c81547d4da;p=platform%2Fupstream%2Fgstreamer.git

plugin: fix spurious exceptions in pygst_require. Fixes #624592.
---

diff --git a/plugin/gstpythonplugin.c b/plugin/gstpythonplugin.c
index f7e37a5..b0c45d5 100644
--- a/plugin/gstpythonplugin.c
+++ b/plugin/gstpythonplugin.c
@@ -283,10 +283,13 @@ pygst_require (gchar * version)
   modules = PySys_GetObject ("modules");
   /* Try to see if 'gst' is already imported */
   if (!(gst = PyMapping_GetItemString (modules, "gst"))) {
+    PyErr_Clear ();
 
     /* if not, see if 'pygst' was already imported. If so, we assume that
      * 'pygst.require' has already been called. */
     if (!(pygst = PyMapping_GetItemString (modules, "pygst"))) {
+      PyErr_Clear ();
+
       if (!(pygst = PyImport_ImportModule ("pygst"))) {
         GST_ERROR ("the pygst module is not available!");
         goto error;