Changeset b7e834c2032b31dd4d717c05737e992ab878f50d

Show
Ignore:
Timestamp:
09/12/05 14:13:20 (3 years ago)
Author:
Olivier Aubert <olivier.aubert@liris.cnrs.fr>
git-committer:
Olivier Aubert <olivier.aubert@liris.cnrs.fr> 1134134000 +0000
git-parent:

[3d26787a02dd791304a412c3378a76668ca2fc04]

git-author:
Olivier Aubert <olivier.aubert@liris.cnrs.fr> 1134134000 +0000
Message:

python/vlcglue.c: exception-related code fixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • bindings/python/vlcglue.c

    r3d26787 rb7e834c  
    5050    PyPosition_Type.tp_alloc = PyType_GenericAlloc; 
    5151 
     52        /*  PyEval_InitThreads(); */ 
     53 
     54        /* Have a look at 
     55http://base.bel-epa.com/pyapache/Python/MySQL-python/MySQL-python-0.3.0/_mysqlmodule.c */ 
     56 
     57    m = Py_InitModule3( "vlc", vlc_methods, 
     58                        "VLC media player embedding module."); 
     59  
     60    if (! m) 
     61      return; 
     62 
    5263    if (PyType_Ready(&PyPosition_Type) < 0) 
    5364        return; 
    …… 
    5970#endif 
    6071 
    61         /*  PyEval_InitThreads(); */ 
    62  
    63         /* Have a look at 
    64 http://base.bel-epa.com/pyapache/Python/MySQL-python/MySQL-python-0.3.0/_mysqlmodule.c */ 
    65  
    66     m = Py_InitModule3( "vlc", vlc_methods, 
    67                         "VLC media player embedding module."); 
    68  
    6972    /* Exceptions */ 
    7073    MediaControl_InternalException = 
    7174            PyErr_NewException("vlc.InternalException", NULL, NULL); 
     75    Py_INCREF(MediaControl_InternalException); 
    7276    PyModule_AddObject(m, "InternalException", MediaControl_InternalException); 
    7377 
    7478    MediaControl_PositionKeyNotSupported = 
    7579            PyErr_NewException("vlc.PositionKeyNotSupported", NULL, NULL); 
     80    Py_INCREF(MediaControl_PositionKeyNotSupported); 
    7681    PyModule_AddObject(m, "PositionKeyNotSupported", 
    7782                    MediaControl_PositionKeyNotSupported); 
    …… 
    7984    MediaControl_PositionOriginNotSupported= 
    8085            PyErr_NewException("vlc.InvalidPosition", NULL, NULL); 
     86    Py_INCREF(MediaControl_PositionOriginNotSupported); 
    8187    PyModule_AddObject(m, "PositionOriginNotSupported", 
    8288                    MediaControl_PositionOriginNotSupported); 
    …… 
    8490    MediaControl_InvalidPosition = 
    8591            PyErr_NewException("vlc.InvalidPosition", NULL, NULL); 
     92    Py_INCREF(MediaControl_InvalidPosition); 
    8693    PyModule_AddObject(m, "InvalidPosition", MediaControl_InvalidPosition); 
    8794 
    8895    MediaControl_PlaylistException = 
    8996            PyErr_NewException("vlc.PlaylistException", NULL, NULL); 
     97    Py_INCREF(MediaControl_PlaylistException); 
    9098    PyModule_AddObject(m, "PlaylistException", MediaControl_PlaylistException); 
    9199 
    …… 
    93101    Py_INCREF(&PyPosition_Type); 
    94102    PyModule_AddObject(m, "Position", (PyObject *)&PyPosition_Type); 
     103 
    95104    Py_INCREF(&MediaControl_Type); 
    96105    PyModule_AddObject(m, "MediaControl", (PyObject *)&MediaControl_Type); 
     106 
    97107#ifdef VLCOBJECT_SUPPORT 
    98108    Py_INCREF(&vlcObject_Type); 
    …… 
    285295 
    286296    if ( !PyArg_ParseTuple(args, "i", &i_id) ) 
    287     { 
    288         PyErr_SetString(PyExc_StandardError, "Error: no id was given.\n"); 
    289         return Py_None; 
    290     } 
     297        return NULL; 
    291298 
    292299    p_object = (vlc_object_t*)vlc_current_object(i_id); 
    …… 
    315322 
    316323    if ( !PyArg_ParseTuple(args, "s", &psz_name) ) 
    317     { 
    318         PyErr_SetString(PyExc_StandardError, "Error: no variable name was given.\n"); 
    319         Py_INCREF(Py_None); 
    320         return Py_None; 
    321     } 
     324        return NULL; 
    322325 
    323326    if( var_Get( VLCSELF->p_object, psz_name, &value ) != VLC_SUCCESS ) 
    324327    { 
    325328            PyErr_SetString(PyExc_StandardError, "Error: no variable name was given.\n"); 
    326             Py_INCREF(Py_None); 
    327             return Py_None; 
     329            return NULL; 
    328330    } 
    329331 
    …… 
    385387 
    386388        if ( !PyArg_ParseTuple(args, "s", &psz_name)) 
    387         { 
    388                 PyErr_SetString(PyExc_StandardError, "Error: no variable name was given.\n"); 
    389                 Py_INCREF(Py_None); 
    390                 return Py_None; 
    391         } 
     389            return NULL; 
    392390 
    393391        i_type = var_Type(VLCSELF->p_object, psz_name); 
    …… 
    455453 
    456454        if ( !PyArg_ParseTuple(args, "sO", &psz_name, &py_value) ) 
    457         { 
    458                 PyErr_SetString(PyExc_StandardError, "Error: no variable name was given.\n"); 
    459                 Py_INCREF(Py_None); 
    460                 return Py_None; 
    461         } 
     455            return NULL; 
    462456 
    463457        p_obj = VLCSELF->p_object; 
    …… 
    538532 
    539533        if ( !PyArg_ParseTuple(args, "s", &psz_name) ) 
    540         { 
    541                 PyErr_SetString(PyExc_StandardError, "Error: no config variable name was given.\n"); 
    542                 Py_INCREF(Py_None); 
    543                 return Py_None; 
    544         } 
     534            return NULL; 
    545535 
    546536        p_config = config_FindConfig( VLCSELF->p_object, psz_name ); 
    …… 
    601591 
    602592        if ( !PyArg_ParseTuple(args, "sO", &psz_name, &py_value) ) 
    603         { 
    604             PyErr_SetString(PyExc_StandardError, 
    605                             "Error: no variable name was given.\n"); 
    606             Py_INCREF(Py_None); 
    607             return Py_None; 
    608         } 
     593            return NULL; 
    609594 
    610595        p_obj = VLCSELF->p_object; 
    …… 
    781766    { 
    782767        /* No arguments were given. Clear the exception raised 
    783     * by PyArg_ParseTuple. */ 
     768          by PyArg_ParseTuple. */ 
    784769        PyErr_Clear(); 
    785770    }