kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=1e43cb98f453583017522fe825202189bc99265f
commit 1e43cb98f453583017522fe825202189bc99265f Author: Kai Huuhko <kai.huu...@gmail.com> Date: Wed Dec 4 13:12:23 2013 +0200 Edje: Use _set_properties_from_keyword_args --- efl/edje/efl.edje_object.pxi | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/efl/edje/efl.edje_object.pxi b/efl/edje/efl.edje_object.pxi index 372e581..b36e172 100644 --- a/efl/edje/efl.edje_object.pxi +++ b/efl/edje/efl.edje_object.pxi @@ -127,26 +127,26 @@ cdef class Edje(Object): def __cinit__(self, *a, **ka): self._signal_callbacks = {} - def __init__(self, Canvas canvas not None, **kargs): + def __init__(self, Canvas canvas not None, file=None, group=None, size=None, + geometry=None, **kwargs): + self._set_obj(edje_object_add(canvas.obj)) _register_decorated_callbacks(self) - self._set_common_params(**kargs) - def __free_wrapper_resources(self, ed): - self._signal_callbacks.clear() - self._text_change_cb = None - self._message_handler_cb = None - - def _set_common_params(self, file=None, group=None, size=None, pos=None, - geometry=None, color=None, name=None): if file: self.file_set(file, group) - Object._set_common_params(self, size=size, pos=pos, geometry=geometry, - color=color, name=name) + + self._set_properties_from_keyword_args(kwargs) + if not size and not geometry: w, h = self.size_min_get() self.size_set(w, h) + def __free_wrapper_resources(self, ed): + self._signal_callbacks.clear() + self._text_change_cb = None + self._message_handler_cb = None + def __str__(self): x, y, w, h = self.geometry_get() r, g, b, a = self.color_get() --