Update of /cvsroot/freevo/kaa/xine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30802/src
Modified Files:
xine.c
Log Message:
Use PyMapping_HasKey instead of PyDict_Contains since it's supported in
2.3; remove some extraneous print statements.
Index: xine.c
===================================================================
RCS file: /cvsroot/freevo/kaa/xine/src/xine.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** xine.c 21 Jul 2005 18:32:12 -0000 1.10
--- xine.c 21 Jul 2005 18:48:18 -0000 1.11
***************
*** 21,25 ****
{
PyObject *key = PyLong_FromLong((long)ptr), *val;
! if (!PyDict_Contains(xine_object_to_pyobject_dict, key)) {
val = PyCObject_FromVoidPtr(o, NULL);
PyDict_SetItem(xine_object_to_pyobject_dict, key, val);
--- 21,25 ----
{
PyObject *key = PyLong_FromLong((long)ptr), *val;
! if (!PyMapping_HasKey(xine_object_to_pyobject_dict, key)) {
val = PyCObject_FromVoidPtr(o, NULL);
PyDict_SetItem(xine_object_to_pyobject_dict, key, val);
***************
*** 33,37 ****
{
PyObject *key = PyLong_FromLong((long)ptr);
! if (PyDict_Contains(xine_object_to_pyobject_dict, key)) {
PyDict_DelItem(xine_object_to_pyobject_dict, key);
}
--- 33,37 ----
{
PyObject *key = PyLong_FromLong((long)ptr);
! if (PyMapping_HasKey(xine_object_to_pyobject_dict, key)) {
PyDict_DelItem(xine_object_to_pyobject_dict, key);
}
***************
*** 44,48 ****
PyObject *key = PyLong_FromLong((long)ptr);
PyObject *o = NULL;
! if (PyDict_Contains(xine_object_to_pyobject_dict, key)) {
o = PyDict_GetItem(xine_object_to_pyobject_dict, key);
}
--- 44,48 ----
PyObject *key = PyLong_FromLong((long)ptr);
PyObject *o = NULL;
! if (PyMapping_HasKey(xine_object_to_pyobject_dict, key)) {
o = PyDict_GetItem(xine_object_to_pyobject_dict, key);
}
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
