Enlightenment CVS committal Author : ulisses Project : e17 Module : proto/python-efl
Dir : e17/proto/python-efl/python-edje/edje Modified Files: edje.c_edje.pyx edje.c_edje_object.pxi Removed Files: edje.c_edje.pxd python.pxd Log Message: Organized and changed code to use Cython instead of Pyrex. - moved headers (.pxd) to include directory - changed README and setup.py to use Cython - using python.pxd from python-evas - fixed namespace issue =================================================================== RCS file: /cvs/e/e17/proto/python-efl/python-edje/edje/edje.c_edje.pyx,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- edje.c_edje.pyx 6 Sep 2007 23:02:28 -0000 1.4 +++ edje.c_edje.pyx 30 Sep 2007 22:35:31 -0000 1.5 @@ -1,4 +1,5 @@ -cimport python +cimport evas.python as python +cimport evas.c_evas import evas.c_evas def init(): =================================================================== RCS file: /cvs/e/e17/proto/python-efl/python-edje/edje/edje.c_edje_object.pxi,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- edje.c_edje_object.pxi 25 Sep 2007 13:36:40 -0000 1.17 +++ edje.c_edje_object.pxi 30 Sep 2007 22:35:31 -0000 1.18 @@ -1,7 +1,8 @@ # This file is included verbatim by edje.c_edje.pyx - +cimport evas.c_evas as c_evas import traceback + cdef void text_change_cb(void *data, evas.c_evas.Evas_Object *obj, char *part): cdef Edje self self = <Edje>data @@ -79,10 +80,10 @@ def __new__(self, *a, **ka): self._signal_callbacks = {} - def __init__(self, evas.c_evas.Canvas canvas not None, **kargs): + def __init__(self, c_evas.Canvas canvas not None, **kargs): evas.c_evas.Object.__init__(self, canvas) if self.obj == NULL: - self._set_obj(edje_object_add(self._evas.obj)) + self._set_obj(edje_object_add(self.evas.obj)) self._set_common_params(**kargs) def __free_wrapper_resources(self, ed): @@ -90,7 +91,7 @@ self._text_change_cb = None self._message_handler_cb = None - cdef int _set_obj(self, evas.c_evas.Evas_Object *obj) except 0: + cdef int _set_obj(self, c_evas.Evas_Object *obj) except 0: cdef int r r = evas.c_evas.Object._set_obj(self, obj) if r == 1: @@ -509,7 +510,7 @@ return item_type = type(data[0]) - if item_type not in (long, int, float, str, unicode): + if item_type not in (long, int, float, str): # FIXME: add unicode raise TypeError("invalid message list type '%s'" % item_type.__name__) ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs