kuuko pushed a commit to branch master.
http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=e837f8f028ce0c6aa83786d9c3209b48572e1dd6
commit e837f8f028ce0c6aa83786d9c3209b48572e1dd6
Author: Kai Huuhko <kai.huu...@gmail.com>
Date: Sat Nov 9 22:58:46 2013 +0200
Elementary: Remove leftover deprecated function declarations.
The ones that have no equivalent replacement still do remain.
---
README | 12 ++++---
TODO | 1 +
api_coverage.py | 17 +++++++---
efl/elementary/diskselector.pxd | 4 ---
efl/elementary/gengrid.pxd | 11 ------
efl/elementary/list.pxd | 4 ---
efl/elementary/notify.pyx | 75 +++++++++--------------------------------
efl/elementary/photocam.pxd | 2 --
8 files changed, 37 insertions(+), 89 deletions(-)
diff --git a/README b/README
index 204ce2e..1004e72 100644
--- a/README
+++ b/README
@@ -20,10 +20,6 @@ CHANGES FROM 1.7 to 1.8
* ecore.file.Download => efl.ecore.FileDownload
* edje.edit.EdjeEdit => efl.edje_edit.EdjeEdit
* Emotion(module_filename="xxx") => Emotion(module_name="xxx")
-* elementary.need_e_dbus => elementary.need_edbus
-* elm.domain_translatable_text_part_set =>
elm.domain_translatable_part_text_set
-* elm.Scroller.custom_widget_base_theme_set => elm.Layout.theme_set
TODO is this right?
-* elm.notify.orient_set/get/prop removed => align_set (TODO)
* elm.ObjectItem.data changed to a dict (previously held args & kwargs)
* Many _set functions that would previously return status now instead raise
@@ -65,3 +61,11 @@ CHANGES FROM 1.7 to 1.8
- python-evas/evas/decorators.py
- python-evas/evas/debug.py
- python-evas old hack to rotate objects
+
+Deprecated in 1.8
+-----------------
+
+* elm.Scroller.custom_widget_base_theme_set => elm.Layout.theme_set
+* elm.notify.orient_set/get/prop removed => align
+* elementary.need_e_dbus => elementary.need_edbus
+* elm.domain_translatable_text_part_set =>
elm.domain_translatable_part_text_set
diff --git a/TODO b/TODO
index d4552e6..2f9f526 100644
--- a/TODO
+++ b/TODO
@@ -27,6 +27,7 @@ TODO
* Evas: SmartObject needs testing, work. Make it inheritable by extension
classes?
* Add missing Eo type mappings, mostly in Ecore
+* Check that README has all changes listed
Elementary
==========
diff --git a/api_coverage.py b/api_coverage.py
index e07c409..4ab90e0 100755
--- a/api_coverage.py
+++ b/api_coverage.py
@@ -9,10 +9,6 @@ import argparse
c_exclude_list = [
"elm_app", # These are only useful for C apps
"elm_widget", # Custom widgets, probably not feasible for us to provide
- #"elm_prefs", # Intended for configuration dialogs
- #"elm_route", # Useless API?
- #"elm_glview", # Is there an OpenGL API for Python that can be used with
this?
- #"evas_gl_", # ditto
"elm_quicklaunch", # Is quicklaunch relevant for us?
"emotion_object_extension_may_play_fast_get", # this optimization does not
work from py
"edje_edit_", # Disabled
@@ -24,6 +20,9 @@ c_exclude_list = [
"ecore_timer_dump", # this is just usefull for debugging
"ecore_throttle_", # I don't know what this is :/ - davemds
"elm_check_state_pointer_set", # Cannot be implemented in Python
+ "elm_access", # Access disabled until 1.9
+ "elm_config_access", # Access disabled until 1.9
+ "elm_object_item_access", # Access disabled until 1.9
]
c_excludes = "|".join(c_exclude_list)
@@ -33,6 +32,14 @@ py_exclude_list = [
"elm_object_item_text", # macro
"elm_object_content", # macro
"elm_object_text", # macro
+ "elm_layout_end", # macros
+ "elm_layout_icon", # macros
+ "elm_object_domain_translatable_text", # macros
+ "elm_object_tooltip_translatable_text", # macros
+ "elm_object_translatable_text", # macros
+ "elm_access", # Access disabled until 1.9
+ "elm_config_access", # Access disabled until 1.9
+ "elm_object_item_access", # Access disabled until 1.9
]
py_excludes = "|".join(py_exclude_list)
@@ -74,7 +81,7 @@ def pkg_config(require, min_vers=None):
def get_capis(inc_path, prefix):
capis = []
- capi_pattern = re.compile("^ *EAPI [A-Za-z_ *\n]+ +\**\n?(?!" + c_excludes
+ ")(" + prefix + "_\w+) *\(", flags = re.S|re.M)
+ capi_pattern = re.compile("^ *EAPI [A-Za-z_ *\n]+ *\**\n?(?!" + c_excludes
+ ")(" + prefix + "_\w+) *\(", flags = re.S|re.M)
for path, dirs, files in os.walk(inc_path):
for f in files:
diff --git a/efl/elementary/diskselector.pxd b/efl/elementary/diskselector.pxd
index 2999013..368e4d8 100644
--- a/efl/elementary/diskselector.pxd
+++ b/efl/elementary/diskselector.pxd
@@ -11,10 +11,6 @@ cdef extern from "Elementary.h":
void
elm_diskselector_side_text_max_length_set(Evas_Object *obj, int len)
void elm_diskselector_display_item_num_set(Evas_Object
*obj, int num)
int elm_diskselector_display_item_num_get(Evas_Object
*obj)
- void elm_diskselector_bounce_set(Evas_Object *obj,
Eina_Bool h_bounce, Eina_Bool v_bounce)
- void elm_diskselector_bounce_get(Evas_Object *obj,
Eina_Bool *h_bounce, Eina_Bool *v_bounce)
- void elm_diskselector_scroller_policy_get(Evas_Object
*obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v)
- void elm_diskselector_scroller_policy_set(Evas_Object
*obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v)
void elm_diskselector_clear(Evas_Object *obj)
const_Eina_List *elm_diskselector_items_get(Evas_Object *obj)
Elm_Object_Item *elm_diskselector_item_append(Evas_Object *obj,
const_char *label, Evas_Object *icon, Evas_Smart_Cb func, void *data)
diff --git a/efl/elementary/gengrid.pxd b/efl/elementary/gengrid.pxd
index c4a82af..d1f308a 100644
--- a/efl/elementary/gengrid.pxd
+++ b/efl/elementary/gengrid.pxd
@@ -30,8 +30,6 @@ cdef extern from "Elementary.h":
Eina_Bool elm_gengrid_multi_select_get(Evas_Object *obj)
void elm_gengrid_horizontal_set(Evas_Object *obj,
Eina_Bool setting)
Eina_Bool elm_gengrid_horizontal_get(Evas_Object *obj)
- void elm_gengrid_bounce_set(Evas_Object *obj, Eina_Bool
h_bounce, Eina_Bool v_bounce)
- void elm_gengrid_bounce_get(Evas_Object *obj, Eina_Bool
*h_bounce, Eina_Bool *v_bounce)
Elm_Object_Item * elm_gengrid_item_append(Evas_Object *obj,
Elm_Gengrid_Item_Class *itc, const_void *data, Evas_Smart_Cb func, const_void
*func_data)
Elm_Object_Item * elm_gengrid_item_prepend(Evas_Object *obj,
Elm_Gengrid_Item_Class *itc, const_void *data, Evas_Smart_Cb func, const_void
*func_data)
Elm_Object_Item * elm_gengrid_item_insert_before(Evas_Object *obj,
Elm_Gengrid_Item_Class *itc, const_void *data, Elm_Object_Item *before,
Evas_Smart_Cb func, const_void *func_data)
@@ -43,8 +41,6 @@ cdef extern from "Elementary.h":
void elm_gengrid_realized_items_update(Evas_Object *obj)
Elm_Object_Item * elm_gengrid_first_item_get(Evas_Object *obj)
Elm_Object_Item * elm_gengrid_last_item_get(Evas_Object *obj)
- void elm_gengrid_scroller_policy_set(Evas_Object *obj,
Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v)
- void elm_gengrid_scroller_policy_get(Evas_Object *obj,
Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v)
unsigned int elm_gengrid_items_count(Evas_Object *obj)
void elm_gengrid_item_size_set(Evas_Object *obj,
Evas_Coord w, Evas_Coord h)
void elm_gengrid_item_size_get(Evas_Object *obj,
Evas_Coord *w, Evas_Coord *h)
@@ -54,13 +50,7 @@ cdef extern from "Elementary.h":
void elm_gengrid_align_get(Evas_Object *obj, double
*align_x, double *align_y)
void elm_gengrid_reorder_mode_set(Evas_Object *obj,
Eina_Bool reorder_mode)
Eina_Bool elm_gengrid_reorder_mode_get(Evas_Object *obj)
- void elm_gengrid_page_relative_set(Evas_Object *obj,
double h_pagerel, double v_pagerel)
- void elm_gengrid_page_relative_get(Evas_Object *obj,
double *h_pagerel, double *v_pagerel)
- void elm_gengrid_page_size_set(Evas_Object *obj,
Evas_Coord h_pagesize, Evas_Coord v_pagesize)
- void elm_gengrid_current_page_get(Evas_Object *obj, int
*h_pagenum, int *v_pagenum)
- void elm_gengrid_last_page_get(Evas_Object *obj, int
*h_pagenum, int *v_pagenum)
void elm_gengrid_page_show(Evas_Object *obj, int
h_pagenum, int v_pagenum)
- void elm_gengrid_page_bring_in(Evas_Object *obj, int
h_pagenum, int v_pagenum)
void elm_gengrid_filled_set(Evas_Object *obj, Eina_Bool
fill)
Eina_Bool elm_gengrid_filled_get(Evas_Object *obj)
void elm_gengrid_select_mode_set(Evas_Object *obj,
Elm_Object_Select_Mode mode)
@@ -79,7 +69,6 @@ cdef extern from "Elementary.h":
Eina_Bool elm_gengrid_item_selected_get(Elm_Object_Item
*item)
void elm_gengrid_item_show(Elm_Object_Item *item,
Elm_Genlist_Item_Scrollto_Type scrollto_type)
void elm_gengrid_item_bring_in(Elm_Object_Item *item,
Elm_Genlist_Item_Scrollto_Type scrollto_type)
- Evas_Object * elm_gengrid_item_object_get(Elm_Object_Item *it)
void elm_gengrid_item_update(Elm_Object_Item *item)
void elm_gengrid_item_pos_get(Elm_Object_Item *item,
unsigned int *x, unsigned int *y)
void elm_gengrid_item_tooltip_text_set(Elm_Object_Item
*item, const_char *text)
diff --git a/efl/elementary/list.pxd b/efl/elementary/list.pxd
index dc74431..31188f2 100644
--- a/efl/elementary/list.pxd
+++ b/efl/elementary/list.pxd
@@ -15,10 +15,6 @@ cdef extern from "Elementary.h":
Eina_Bool elm_list_horizontal_get(Evas_Object *obj)
void elm_list_select_mode_set(Evas_Object *obj,
Elm_Object_Select_Mode mode)
Elm_Object_Select_Mode elm_list_select_mode_get(Evas_Object *obj)
- void elm_list_bounce_set(Evas_Object *obj, Eina_Bool
h_bounce, Eina_Bool v_bounce)
- void elm_list_bounce_get(Evas_Object *obj, Eina_Bool
*h_bounce, Eina_Bool *v_bounce)
- void elm_list_scroller_policy_set(Evas_Object *obj,
Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v)
- void elm_list_scroller_policy_get(Evas_Object *obj,
Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v)
Elm_Object_Item *elm_list_item_append(Evas_Object *obj, const_char
*label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, void *data)
Elm_Object_Item *elm_list_item_prepend(Evas_Object *obj,
const_char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func,
void *data)
Elm_Object_Item *elm_list_item_insert_before(Evas_Object *obj,
Elm_Object_Item *before, const_char *label, Evas_Object *icon, Evas_Object
*end, Evas_Smart_Cb func, void *data)
diff --git a/efl/elementary/notify.pyx b/efl/elementary/notify.pyx
index b9b2c27..0eed155 100644
--- a/efl/elementary/notify.pyx
+++ b/efl/elementary/notify.pyx
@@ -41,48 +41,6 @@ Default content parts of the notify widget that you can use
are:
Enumerations
------------
-.. _Elm_Notify_Orient:
-
-Notify orientation types
-========================
-
-.. data:: ELM_NOTIFY_ORIENT_TOP
-
- Top orientation
-
-.. data:: ELM_NOTIFY_ORIENT_CENTER
-
- Center orientation
-
-.. data:: ELM_NOTIFY_ORIENT_BOTTOM
-
- Bottom orientation
-
-.. data:: ELM_NOTIFY_ORIENT_LEFT
-
- Left orientation
-
-.. data:: ELM_NOTIFY_ORIENT_RIGHT
-
- Right orientation
-
-.. data:: ELM_NOTIFY_ORIENT_TOP_LEFT
-
- Top left orientation
-
-.. data:: ELM_NOTIFY_ORIENT_TOP_RIGHT
-
- Top right orientation
-
-.. data:: ELM_NOTIFY_ORIENT_BOTTOM_LEFT
-
- Bottom left orientation
-
-.. data:: ELM_NOTIFY_ORIENT_BOTTOM_RIGHT
-
- Bottom right orientation
-
-
.. _ELM_NOTIFY_ALIGN_FILL:
ELM_NOTIFY_ALIGN_FILL
@@ -102,6 +60,7 @@ from efl.eo cimport _object_mapping_register,
object_from_instance
from efl.utils.conversions cimport _ctouni
from efl.evas cimport Object as evasObject
from object cimport Object
+from efl.utils.deprecated cimport DEPRECATED
cimport enums
@@ -150,23 +109,6 @@ cdef class Notify(Object):
def parent_get(self):
return object_from_instance(elm_notify_parent_get(self.obj))
- property orient:
- """The position in which the notify will appear in its parent.
-
- :type: :ref:`Notify orientation <Elm_Notify_Orient>`
-
- """
- def __get__(self):
- return elm_notify_orient_get(self.obj)
-
- def __set__(self, orient):
- elm_notify_orient_set(self.obj, orient)
-
- def orient_set(self, int orient):
- elm_notify_orient_set(self.obj, orient)
- def orient_get(self):
- return elm_notify_orient_get(self.obj)
-
property timeout:
"""The time interval after which the notify window is going to be
hidden.
@@ -265,4 +207,19 @@ cdef class Notify(Object):
self._callback_del("block,clicked", func)
+ property orient:
+ def __get__(self):
+ return self.orient_get()
+
+ def __set__(self, orient):
+ self.orient_set(orient)
+
+ @DEPRECATED("1.8", "Use align instead.")
+ def orient_set(self, int orient):
+ elm_notify_orient_set(self.obj, orient)
+ @DEPRECATED("1.8", "Use align instead.")
+ def orient_get(self):
+ return elm_notify_orient_get(self.obj)
+
+
_object_mapping_register("Elm_Notify", Notify)
diff --git a/efl/elementary/photocam.pxd b/efl/elementary/photocam.pxd
index a315625..a90b2e4 100644
--- a/efl/elementary/photocam.pxd
+++ b/efl/elementary/photocam.pxd
@@ -26,7 +26,5 @@ cdef extern from "Elementary.h":
void elm_photocam_paused_set(Evas_Object *obj,
Eina_Bool paused)
Eina_Bool elm_photocam_paused_get(Evas_Object *obj)
Evas_Object *elm_photocam_internal_image_get(Evas_Object *obj)
- void elm_photocam_bounce_set(Evas_Object *obj,
Eina_Bool h_bounce, Eina_Bool v_bounce)
- void elm_photocam_bounce_get(Evas_Object *obj,
Eina_Bool *h_bounce, Eina_Bool *v_bounce)
void elm_photocam_gesture_enabled_set(Evas_Object
*obj, Eina_Bool gesture)
Eina_Bool elm_photocam_gesture_enabled_get(Evas_Object *obj)
--
