summaryrefslogtreecommitdiff
authorLeo Singer <lsinger@calltech.edu>2010-08-30 09:57:07 (GMT)
committer Alessandro Decina <alessandro.d@gmail.com>2010-08-30 09:57:07 (GMT)
commit2c31e12c5eccf74415ccdc643affa5c81547d4da (patch) (side-by-side diff)
tree868e21aa8272305be5080da1e9cb2bc470ed79b1
parent01dda89d42ed5b72d3dde6b6432245dc968f8114 (diff)
downloadgst-python-2c31e12c5eccf74415ccdc643affa5c81547d4da.zip
gst-python-2c31e12c5eccf74415ccdc643affa5c81547d4da.tar.gz
plugin: fix spurious exceptions in pygst_require. Fixes #624592.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--plugin/gstpythonplugin.c3
1 files changed, 3 insertions, 0 deletions
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;