projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
01dda89
)
plugin: fix spurious exceptions in pygst_require. Fixes #624592.
author
Leo Singer
<lsinger@calltech.edu>
Mon, 30 Aug 2010 09:57:07 +0000
(11:57 +0200)
committer
Alessandro Decina
<alessandro.d@gmail.com>
Mon, 30 Aug 2010 09:57:07 +0000
(11:57 +0200)
plugin/gstpythonplugin.c
patch
|
blob
|
history
diff --git
a/plugin/gstpythonplugin.c
b/plugin/gstpythonplugin.c
index
f7e37a5
..
b0c45d5
100644
(file)
--- 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;