kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=6980ffb0e44d72c3ee4db711182de9c55828cbfd
commit 6980ffb0e44d72c3ee4db711182de9c55828cbfd Author: Kai Huuhko <kai.huu...@gmail.com> Date: Sat Jan 23 15:55:49 2016 +0200 Elementary: Use the private internal_data dict instead of abusing user data dict --- efl/elementary/cnp_callbacks.pxi | 8 ++++---- efl/elementary/gengrid_widget.pxi | 10 +++++----- efl/elementary/genlist_widget.pxi | 18 +++++++++--------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/efl/elementary/cnp_callbacks.pxi b/efl/elementary/cnp_callbacks.pxi index 8c49ae7..8e6b7e4 100644 --- a/efl/elementary/cnp_callbacks.pxi +++ b/efl/elementary/cnp_callbacks.pxi @@ -143,7 +143,7 @@ cdef Elm_Object_Item *py_elm_xy_item_get_cb(Evas_Object *obj, Evas_Coord x, Evas ObjectItem it try: - ret = o.data["xy_item_get_cb"](o, x, y) + ret = o.internal_data["xy_item_get_cb"](o, x, y) it, xpos1, ypos1 = ret except Exception: traceback.print_exc() @@ -321,7 +321,7 @@ cdef void py_elm_drag_item_container_pos( ObjectItem item = _object_item_to_python(it) try: - o.data["drag_item_container_pos"](o, item, x, y, xposret, yposret, action, <object>data if data is not NULL else None) + o.internal_data["drag_item_container_pos"](o, item, x, y, xposret, yposret, action, <object>data if data is not NULL else None) except Exception: traceback.print_exc() @@ -352,7 +352,7 @@ cdef Eina_Bool py_elm_drop_item_container_cb( evdata.sel_data = ev - cb = o.data["drop_item_container_cb"] + cb = o.internal_data["drop_item_container_cb"] if data != NULL: cbdata = <object>data @@ -434,7 +434,7 @@ cdef Eina_Bool py_elm_item_container_data_get_cb( bint ret try: - func = o.data["item_container_data_get_cb"] + func = o.internal_data["item_container_data_get_cb"] ret = func(o, item, pyinfo) except Exception: traceback.print_exc() diff --git a/efl/elementary/gengrid_widget.pxi b/efl/elementary/gengrid_widget.pxi index a96c35d..58e7a54 100644 --- a/efl/elementary/gengrid_widget.pxi +++ b/efl/elementary/gengrid_widget.pxi @@ -651,9 +651,9 @@ cdef class Gengrid(Object): if itemgetcb is not None: if not callable(itemgetcb): raise TypeError("itemgetcb must be callable.") - self.data["xy_item_get_cb"] = itemgetcb + self.internal_data["xy_item_get_cb"] = itemgetcb - self.data["item_container_data_get_cb"] = data_get + self.internal_data["item_container_data_get_cb"] = data_get if not elm_drag_item_container_add(self.obj, tm_to_anim, @@ -702,10 +702,10 @@ cdef class Gengrid(Object): if itemgetcb is not None: if not callable(itemgetcb): raise TypeError("itemgetcb must be callable.") - self.data["xy_item_get_cb"] = itemgetcb + self.internal_data["xy_item_get_cb"] = itemgetcb - self.data["drag_item_container_pos"] = poscb - self.data["drop_item_container_cb"] = dropcb + self.internal_data["drag_item_container_pos"] = poscb + self.internal_data["drop_item_container_cb"] = dropcb if not elm_drop_item_container_add(self.obj, format, diff --git a/efl/elementary/genlist_widget.pxi b/efl/elementary/genlist_widget.pxi index 416678b..b558f4a 100644 --- a/efl/elementary/genlist_widget.pxi +++ b/efl/elementary/genlist_widget.pxi @@ -723,17 +723,17 @@ cdef class Genlist(Object): """ def __set__(self, object key): - self.data['__filterkeyref'] = key # keep a reference for key + self.internal_data['__filterkeyref'] = key # keep a reference for key elm_genlist_filter_set(self.obj, <void *>key if key is not None else NULL) def __get__(self): - return self.data['__filterkeyref'] + return self.internal_data['__filterkeyref'] def filter_set(self, key): - self.data['__filterkeyref'] = key + self.internal_data['__filterkeyref'] = key elm_genlist_filter_set(self.obj, <void*>key if key is not None else NULL) def filter_get(self): - return self.data['__filterkeyref'] + return self.internal_data['__filterkeyref'] # # Drag and Drop @@ -757,9 +757,9 @@ cdef class Genlist(Object): if itemgetcb is not None: if not callable(itemgetcb): raise TypeError("itemgetcb must be callable.") - self.data["xy_item_get_cb"] = itemgetcb + self.internal_data["xy_item_get_cb"] = itemgetcb - self.data["item_container_data_get_cb"] = data_get + self.internal_data["item_container_data_get_cb"] = data_get if not elm_drag_item_container_add(self.obj, tm_to_anim, @@ -808,10 +808,10 @@ cdef class Genlist(Object): if itemgetcb is not None: if not callable(itemgetcb): raise TypeError("itemgetcb must be callable.") - self.data["xy_item_get_cb"] = itemgetcb + self.internal_data["xy_item_get_cb"] = itemgetcb - self.data["drag_item_container_pos"] = poscb - self.data["drop_item_container_cb"] = dropcb + self.internal_data["drag_item_container_pos"] = poscb + self.internal_data["drop_item_container_cb"] = dropcb if not elm_drop_item_container_add(self.obj, format, --