summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Huuhko <kai.huuhko@gmail.com>2014-04-14 00:50:16 +0300
committerKai Huuhko <kai.huuhko@gmail.com>2014-04-14 00:51:19 +0300
commitd65101b24bfa8ab59b151d14af79b062d12ba0fa (patch)
tree866eb984452637f83a6cad9211a119ec92fb2123
parent929812e39e816c3f641bf8c030f6609aa4496923 (diff)
Code cleanup: Unused/misplaced cimports
-rw-r--r--efl/edje/efl.edje.pyx1
-rw-r--r--efl/edje/efl.edje_edit.pyx7
-rw-r--r--efl/edje/efl.edje_external.pxi2
-rw-r--r--efl/elementary/actionslider.pyx1
-rw-r--r--efl/elementary/box.pxd1
-rw-r--r--efl/elementary/box.pyx3
-rw-r--r--efl/elementary/bubble.pyx3
-rw-r--r--efl/elementary/calendar_elm.pyx4
-rw-r--r--efl/elementary/check.pyx1
-rw-r--r--efl/elementary/clock.pyx1
-rw-r--r--efl/elementary/colorselector.pyx2
-rw-r--r--efl/elementary/configuration.pxd3
-rw-r--r--efl/elementary/ctxpopup.pyx3
-rw-r--r--efl/elementary/dayselector.pyx4
-rw-r--r--efl/elementary/diskselector.pxd3
-rw-r--r--efl/elementary/diskselector.pyx3
-rw-r--r--efl/elementary/entry.pxd2
-rw-r--r--efl/elementary/entry.pyx2
-rw-r--r--efl/elementary/fileselector_button.pyx2
-rw-r--r--efl/elementary/fileselector_entry.pyx2
-rw-r--r--efl/elementary/flipselector.pxd4
-rw-r--r--efl/elementary/flipselector.pyx3
-rw-r--r--efl/elementary/frame.pyx3
-rw-r--r--efl/elementary/general.pxd7
-rw-r--r--efl/elementary/general.pyx8
-rw-r--r--efl/elementary/gengrid.pxd3
-rw-r--r--efl/elementary/genlist.pxd3
-rw-r--r--efl/elementary/genlist.pyx4
-rw-r--r--efl/elementary/genlist_widget.pxi2
-rw-r--r--efl/elementary/gesture_layer.pyx3
-rw-r--r--efl/elementary/glview.pyx1
-rw-r--r--efl/elementary/hover.pyx2
-rw-r--r--efl/elementary/hoversel.pyx2
-rw-r--r--efl/elementary/icon.pxd3
-rw-r--r--efl/elementary/icon.pyx1
-rw-r--r--efl/elementary/index.pxd3
-rw-r--r--efl/elementary/index.pyx6
-rw-r--r--efl/elementary/label.pyx3
-rw-r--r--efl/elementary/layout.pxd2
-rw-r--r--efl/elementary/layout.pyx5
-rw-r--r--efl/elementary/list.pxd4
-rw-r--r--efl/elementary/list.pyx5
-rw-r--r--efl/elementary/menu.pxd2
-rw-r--r--efl/elementary/menu.pyx4
-rw-r--r--efl/elementary/multibuttonentry.pxd2
-rw-r--r--efl/elementary/multibuttonentry.pyx5
-rw-r--r--efl/elementary/naviframe.pxd2
-rw-r--r--efl/elementary/naviframe.pyx4
-rw-r--r--efl/elementary/notify.pxd1
-rw-r--r--efl/elementary/notify.pyx3
-rw-r--r--efl/elementary/object.pxd1
-rw-r--r--efl/elementary/object_item.pyx4
-rw-r--r--efl/elementary/panel.pyx1
-rw-r--r--efl/elementary/photo.pyx1
-rw-r--r--efl/elementary/plug.pyx3
-rw-r--r--efl/elementary/popup.pxd2
-rw-r--r--efl/elementary/popup.pyx6
-rw-r--r--efl/elementary/progressbar.pyx2
-rw-r--r--efl/elementary/scroller.pyx5
-rw-r--r--efl/elementary/segment_control.pxd2
-rw-r--r--efl/elementary/segment_control.pyx2
-rw-r--r--efl/elementary/slideshow.pxd2
-rw-r--r--efl/elementary/slideshow.pyx5
-rw-r--r--efl/elementary/store.pyx1
-rw-r--r--efl/elementary/theme.pyx2
-rw-r--r--efl/elementary/toolbar.pxd2
-rw-r--r--efl/elementary/toolbar.pyx4
-rw-r--r--efl/elementary/transit.pyx4
-rw-r--r--efl/elementary/window.pyx4
-rw-r--r--efl/eo/efl.eo.pyx5
-rw-r--r--efl/evas/efl.evas.pyx6
-rw-r--r--efl/evas/efl.evas_canvas.pxi3
-rw-r--r--efl/evas/efl.evas_canvas_callbacks.pxi1
-rw-r--r--efl/evas/efl.evas_object_events.pxi2
-rw-r--r--efl/evas/efl.evas_object_image.pxi2
-rw-r--r--efl/evas/efl.evas_object_textgrid.pxi2
-rw-r--r--efl/evas/smart_object_metaclass.pxi2
-rw-r--r--efl/utils/conversions.pyx2
-rw-r--r--include/efl.edje.pxd5
-rw-r--r--include/efl.edje_edit.pxd8
-rw-r--r--include/efl.eina.pxd2
-rw-r--r--include/efl.eo.pxd2
82 files changed, 90 insertions, 155 deletions
diff --git a/efl/edje/efl.edje.pyx b/efl/edje/efl.edje.pyx
index 1203f02..94a48eb 100644
--- a/efl/edje/efl.edje.pyx
+++ b/efl/edje/efl.edje.pyx
@@ -22,6 +22,7 @@ from cpython cimport PyMem_Malloc, PyMem_Free, PyUnicode_AsUTF8String
22cimport libc.stdlib 22cimport libc.stdlib
23from libc.stdint cimport uintptr_t 23from libc.stdint cimport uintptr_t
24 24
25from efl.eina cimport eina_list_free, eina_stringshare_del, Eina_Stringshare
25from efl.eo cimport _object_mapping_register, object_from_instance, \ 26from efl.eo cimport _object_mapping_register, object_from_instance, \
26 _register_decorated_callbacks 27 _register_decorated_callbacks
27 28
diff --git a/efl/edje/efl.edje_edit.pyx b/efl/edje/efl.edje_edit.pyx
index ae548dc..8a037e0 100644
--- a/efl/edje/efl.edje_edit.pyx
+++ b/efl/edje/efl.edje_edit.pyx
@@ -15,10 +15,15 @@
15# You should have received a copy of the GNU Lesser General Public License 15# You should have received a copy of the GNU Lesser General Public License
16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>. 16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>.
17 17
18from libc.stdlib cimport free
19
20from efl.eina cimport eina_stringshare_add, eina_stringshare_del, \
21 eina_stringshare_replace
18from efl.utils.conversions cimport _touni, _ctouni, \ 22from efl.utils.conversions cimport _touni, _ctouni, \
19 eina_list_strings_to_python_list 23 eina_list_strings_to_python_list
20from efl.eo cimport _register_decorated_callbacks 24from efl.eo cimport _register_decorated_callbacks
21from efl.edje cimport Edje_Part_Type 25from efl.evas cimport Canvas
26from efl.edje cimport Edje_Part_Type, Edje
22from efl.edje import EDJE_PART_TYPE_EXTERNAL 27from efl.edje import EDJE_PART_TYPE_EXTERNAL
23 28
24 29
diff --git a/efl/edje/efl.edje_external.pxi b/efl/edje/efl.edje_external.pxi
index 316bf06..25d5f2c 100644
--- a/efl/edje/efl.edje_external.pxi
+++ b/efl/edje/efl.edje_external.pxi
@@ -15,6 +15,8 @@
15# You should have received a copy of the GNU Lesser General Public License 15# You should have received a copy of the GNU Lesser General Public License
16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>. 16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>.
17 17
18from efl.eina cimport Eina_Hash_Tuple, eina_iterator_next, eina_iterator_free
19from efl.evas cimport Canvas
18 20
19cdef class ExternalParam: 21cdef class ExternalParam:
20 property name: 22 property name:
diff --git a/efl/elementary/actionslider.pyx b/efl/elementary/actionslider.pyx
index 8f1b491..7b680f1 100644
--- a/efl/elementary/actionslider.pyx
+++ b/efl/elementary/actionslider.pyx
@@ -86,7 +86,6 @@ Actionslider positions
86 86
87""" 87"""
88 88
89from cpython cimport PyUnicode_AsUTF8String
90from libc.stdint cimport uintptr_t 89from libc.stdint cimport uintptr_t
91 90
92from efl.eo cimport _object_mapping_register 91from efl.eo cimport _object_mapping_register
diff --git a/efl/elementary/box.pxd b/efl/elementary/box.pxd
index dfe84a6..b4b232a 100644
--- a/efl/elementary/box.pxd
+++ b/efl/elementary/box.pxd
@@ -1,5 +1,4 @@
1from efl.evas cimport Eina_Bool, Eina_List, Evas_Object, Evas_Coord 1from efl.evas cimport Eina_Bool, Eina_List, Evas_Object, Evas_Coord
2from enums cimport Elm_Box_CLayout
3 2
4cdef extern from "Ecore.h": 3cdef extern from "Ecore.h":
5 ctypedef void (*Ecore_Cb)(void *data) 4 ctypedef void (*Ecore_Cb)(void *data)
diff --git a/efl/elementary/box.pyx b/efl/elementary/box.pyx
index 92c4cb6..2ef9114 100644
--- a/efl/elementary/box.pyx
+++ b/efl/elementary/box.pyx
@@ -125,10 +125,7 @@ Box layout modes
125 125
126""" 126"""
127 127
128from cpython cimport PyUnicode_AsUTF8String
129
130from efl.eo cimport _object_mapping_register 128from efl.eo cimport _object_mapping_register
131from efl.utils.conversions cimport _ctouni
132from efl.evas cimport Object as evasObject 129from efl.evas cimport Object as evasObject
133from object cimport Object 130from object cimport Object
134 131
diff --git a/efl/elementary/bubble.pyx b/efl/elementary/bubble.pyx
index bcef960..046a75f 100644
--- a/efl/elementary/bubble.pyx
+++ b/efl/elementary/bubble.pyx
@@ -89,10 +89,7 @@ Bubble arrow positions
89 89
90""" 90"""
91 91
92from cpython cimport PyUnicode_AsUTF8String
93
94from efl.eo cimport _object_mapping_register 92from efl.eo cimport _object_mapping_register
95from efl.utils.conversions cimport _ctouni
96from efl.evas cimport Object as evasObject 93from efl.evas cimport Object as evasObject
97from layout_class cimport LayoutClass 94from layout_class cimport LayoutClass
98 95
diff --git a/efl/elementary/calendar_elm.pyx b/efl/elementary/calendar_elm.pyx
index 51cb9ff..2d6f9b9 100644
--- a/efl/elementary/calendar_elm.pyx
+++ b/efl/elementary/calendar_elm.pyx
@@ -167,9 +167,9 @@ Days
167 167
168""" 168"""
169 169
170from cpython cimport PyUnicode_AsUTF8String, PyMem_Malloc, PyMem_Free 170from cpython cimport PyUnicode_AsUTF8String
171 171
172from efl.utils.conversions cimport _ctouni, array_of_strings_to_python_list, \ 172from efl.utils.conversions cimport array_of_strings_to_python_list, \
173 python_list_strings_to_array_of_strings 173 python_list_strings_to_array_of_strings
174from efl.eo cimport _object_mapping_register 174from efl.eo cimport _object_mapping_register
175from efl.evas cimport Object as evasObject 175from efl.evas cimport Object as evasObject
diff --git a/efl/elementary/check.pyx b/efl/elementary/check.pyx
index f220042..e5fef92 100644
--- a/efl/elementary/check.pyx
+++ b/efl/elementary/check.pyx
@@ -51,7 +51,6 @@ Default text parts of the check widget that you can use for are:
51""" 51"""
52 52
53from efl.eo cimport _object_mapping_register 53from efl.eo cimport _object_mapping_register
54from efl.utils.conversions cimport _ctouni
55from efl.evas cimport Object as evasObject 54from efl.evas cimport Object as evasObject
56from layout_class cimport LayoutClass 55from layout_class cimport LayoutClass
57 56
diff --git a/efl/elementary/clock.pyx b/efl/elementary/clock.pyx
index a825e89..f22162a 100644
--- a/efl/elementary/clock.pyx
+++ b/efl/elementary/clock.pyx
@@ -100,7 +100,6 @@ Clock edit modes
100""" 100"""
101 101
102from efl.eo cimport _object_mapping_register 102from efl.eo cimport _object_mapping_register
103from efl.utils.conversions cimport _ctouni
104from efl.evas cimport Object as evasObject 103from efl.evas cimport Object as evasObject
105from layout_class cimport LayoutClass 104from layout_class cimport LayoutClass
106 105
diff --git a/efl/elementary/colorselector.pyx b/efl/elementary/colorselector.pyx
index 871d9c7..c0e2bb5 100644
--- a/efl/elementary/colorselector.pyx
+++ b/efl/elementary/colorselector.pyx
@@ -68,7 +68,7 @@ Colorselector modes
68 68
69""" 69"""
70 70
71from cpython cimport PyUnicode_AsUTF8String, Py_DECREF 71from cpython cimport PyUnicode_AsUTF8String
72from libc.stdint cimport uintptr_t 72from libc.stdint cimport uintptr_t
73 73
74from efl.eo cimport _object_mapping_register 74from efl.eo cimport _object_mapping_register
diff --git a/efl/elementary/configuration.pxd b/efl/elementary/configuration.pxd
index f3e4a43..890d3b9 100644
--- a/efl/elementary/configuration.pxd
+++ b/efl/elementary/configuration.pxd
@@ -1,5 +1,4 @@
1from efl.evas cimport Eina_Bool, Eina_List, Evas_Coord, Evas_Object, \ 1from efl.evas cimport Eina_Bool, Eina_List, Evas_Coord, Evas_Font_Size
2 Evas_Font_Size
3from enums cimport Elm_Softcursor_Mode 2from enums cimport Elm_Softcursor_Mode
4 3
5cdef extern from "Elementary.h": 4cdef extern from "Elementary.h":
diff --git a/efl/elementary/ctxpopup.pyx b/efl/elementary/ctxpopup.pyx
index 14d3fac..764b36c 100644
--- a/efl/elementary/ctxpopup.pyx
+++ b/efl/elementary/ctxpopup.pyx
@@ -89,10 +89,9 @@ Ctxpopup arrow directions
89 89
90""" 90"""
91 91
92from cpython cimport PyUnicode_AsUTF8String, Py_DECREF 92from cpython cimport PyUnicode_AsUTF8String
93 93
94from efl.eo cimport _object_mapping_register, object_from_instance 94from efl.eo cimport _object_mapping_register, object_from_instance
95from efl.utils.conversions cimport _ctouni
96from efl.evas cimport Object as evasObject 95from efl.evas cimport Object as evasObject
97from layout_class cimport LayoutClass 96from layout_class cimport LayoutClass
98from object_item cimport ObjectItem, _object_item_callback, \ 97from object_item cimport ObjectItem, _object_item_callback, \
diff --git a/efl/elementary/dayselector.pyx b/efl/elementary/dayselector.pyx
index cbf1880..1d1d5fe 100644
--- a/efl/elementary/dayselector.pyx
+++ b/efl/elementary/dayselector.pyx
@@ -108,12 +108,10 @@ Dayselector days
108 108
109""" 109"""
110 110
111from cpython cimport PyUnicode_AsUTF8String
112
113from efl.eo cimport _object_mapping_register 111from efl.eo cimport _object_mapping_register
114from efl.evas cimport Object as evasObject 112from efl.evas cimport Object as evasObject
115from efl.utils.conversions cimport python_list_strings_to_array_of_strings, \ 113from efl.utils.conversions cimport python_list_strings_to_array_of_strings, \
116 eina_list_strings_to_python_list, _ctouni 114 eina_list_strings_to_python_list
117from layout_class cimport LayoutClass 115from layout_class cimport LayoutClass
118 116
119cimport enums 117cimport enums
diff --git a/efl/elementary/diskselector.pxd b/efl/elementary/diskselector.pxd
index 8b9fa34..123d32e 100644
--- a/efl/elementary/diskselector.pxd
+++ b/efl/elementary/diskselector.pxd
@@ -1,7 +1,6 @@
1from efl.eina cimport Eina_List 1from efl.eina cimport Eina_List
2from efl.evas cimport Eina_Bool, Evas_Object, Evas_Smart_Cb 2from efl.evas cimport Eina_Bool, Evas_Object, Evas_Smart_Cb
3from object_item cimport Elm_Object_Item, ObjectItem 3from object_item cimport Elm_Object_Item
4from enums cimport Elm_Scroller_Policy
5 4
6cdef extern from "Elementary.h": 5cdef extern from "Elementary.h":
7 Evas_Object *elm_diskselector_add(Evas_Object *parent) 6 Evas_Object *elm_diskselector_add(Evas_Object *parent)
diff --git a/efl/elementary/diskselector.pyx b/efl/elementary/diskselector.pyx
index d1caab0..59afbe1 100644
--- a/efl/elementary/diskselector.pyx
+++ b/efl/elementary/diskselector.pyx
@@ -71,11 +71,10 @@ using multiple inheritance, for example::
71 71
72""" 72"""
73 73
74from cpython cimport PyUnicode_AsUTF8String, Py_DECREF 74from cpython cimport PyUnicode_AsUTF8String
75from libc.stdint cimport uintptr_t 75from libc.stdint cimport uintptr_t
76 76
77from efl.eo cimport _object_mapping_register 77from efl.eo cimport _object_mapping_register
78from efl.utils.conversions cimport _ctouni
79from efl.evas cimport Object as evasObject 78from efl.evas cimport Object as evasObject
80from object cimport Object 79from object cimport Object
81from object_item cimport ObjectItem, _object_item_callback, \ 80from object_item cimport ObjectItem, _object_item_callback, \
diff --git a/efl/elementary/entry.pxd b/efl/elementary/entry.pxd
index 86864e2..0096f7d 100644
--- a/efl/elementary/entry.pxd
+++ b/efl/elementary/entry.pxd
@@ -1,7 +1,7 @@
1from efl.evas cimport Eina_Bool, Eina_Rectangle, Evas_Object, \ 1from efl.evas cimport Eina_Bool, Eina_Rectangle, Evas_Object, \
2 Evas_Coord, Evas_Smart_Cb 2 Evas_Coord, Evas_Smart_Cb
3from enums cimport Elm_Wrap_Type, Elm_Text_Format, Elm_Cnp_Mode, \ 3from enums cimport Elm_Wrap_Type, Elm_Text_Format, Elm_Cnp_Mode, \
4 Elm_Scroller_Policy, Elm_Input_Panel_Layout, Elm_Input_Panel_Lang, \ 4 Elm_Input_Panel_Layout, Elm_Input_Panel_Lang, \
5 Elm_Input_Panel_Lang, Elm_Input_Panel_Return_Key_Type, \ 5 Elm_Input_Panel_Lang, Elm_Input_Panel_Return_Key_Type, \
6 Elm_Autocapital_Type, Elm_Icon_Type, Elm_Sel_Type, Elm_Sel_Format, \ 6 Elm_Autocapital_Type, Elm_Icon_Type, Elm_Sel_Type, Elm_Sel_Format, \
7 Elm_Xdnd_Action 7 Elm_Xdnd_Action
diff --git a/efl/elementary/entry.pyx b/efl/elementary/entry.pyx
index 3984b94..f843d02 100644
--- a/efl/elementary/entry.pyx
+++ b/efl/elementary/entry.pyx
@@ -477,9 +477,7 @@ from cpython cimport PyUnicode_AsUTF8String, Py_INCREF
477from efl.eo cimport _object_mapping_register, object_from_instance 477from efl.eo cimport _object_mapping_register, object_from_instance
478from efl.utils.conversions cimport _touni, _ctouni 478from efl.utils.conversions cimport _touni, _ctouni
479from efl.evas cimport Object as evasObject 479from efl.evas cimport Object as evasObject
480from object cimport Object
481from layout_class cimport LayoutClass 480from layout_class cimport LayoutClass
482from hover cimport Hover
483 481
484from efl.utils.deprecated cimport DEPRECATED 482from efl.utils.deprecated cimport DEPRECATED
485from scroller cimport elm_scroller_policy_get, elm_scroller_policy_set, \ 483from scroller cimport elm_scroller_policy_get, elm_scroller_policy_set, \
diff --git a/efl/elementary/fileselector_button.pyx b/efl/elementary/fileselector_button.pyx
index 82b633a..746c4e8 100644
--- a/efl/elementary/fileselector_button.pyx
+++ b/efl/elementary/fileselector_button.pyx
@@ -90,8 +90,6 @@ from fileselector cimport elm_fileselector_path_set, \
90 elm_fileselector_folder_only_get, elm_fileselector_is_save_set, \ 90 elm_fileselector_folder_only_get, elm_fileselector_is_save_set, \
91 elm_fileselector_is_save_get 91 elm_fileselector_is_save_get
92 92
93cimport enums
94
95def _cb_string_conv(uintptr_t addr): 93def _cb_string_conv(uintptr_t addr):
96 cdef const char *s = <const char *>addr 94 cdef const char *s = <const char *>addr
97 return _ctouni(s) if s is not NULL else None 95 return _ctouni(s) if s is not NULL else None
diff --git a/efl/elementary/fileselector_entry.pyx b/efl/elementary/fileselector_entry.pyx
index eb51e2a..1eda84d 100644
--- a/efl/elementary/fileselector_entry.pyx
+++ b/efl/elementary/fileselector_entry.pyx
@@ -106,8 +106,6 @@ from fileselector cimport elm_fileselector_path_set, \
106 elm_fileselector_is_save_get, elm_fileselector_selected_set, \ 106 elm_fileselector_is_save_get, elm_fileselector_selected_set, \
107 elm_fileselector_selected_get 107 elm_fileselector_selected_get
108 108
109cimport enums
110
111def _cb_string_conv(uintptr_t addr): 109def _cb_string_conv(uintptr_t addr):
112 cdef const char *s = <const char *>addr 110 cdef const char *s = <const char *>addr
113 return _ctouni(s) if s is not NULL else None 111 return _ctouni(s) if s is not NULL else None
diff --git a/efl/elementary/flipselector.pxd b/efl/elementary/flipselector.pxd
index b140f7c..9f94245 100644
--- a/efl/elementary/flipselector.pxd
+++ b/efl/elementary/flipselector.pxd
@@ -1,6 +1,6 @@
1from efl.evas cimport Eina_Bool, Evas_Object, Evas_Coord, Eina_List 1from efl.evas cimport Eina_Bool, Evas_Object, Eina_List
2from efl.evas cimport Evas_Smart_Cb 2from efl.evas cimport Evas_Smart_Cb
3from object_item cimport Elm_Object_Item, ObjectItem 3from object_item cimport Elm_Object_Item
4 4
5cdef extern from "Elementary.h": 5cdef extern from "Elementary.h":
6 Evas_Object *elm_flipselector_add(Evas_Object *parent) 6 Evas_Object *elm_flipselector_add(Evas_Object *parent)
diff --git a/efl/elementary/flipselector.pyx b/efl/elementary/flipselector.pyx
index 79a83c2..b02edc8 100644
--- a/efl/elementary/flipselector.pyx
+++ b/efl/elementary/flipselector.pyx
@@ -60,11 +60,10 @@ from cpython cimport PyUnicode_AsUTF8String
60from libc.stdint cimport uintptr_t 60from libc.stdint cimport uintptr_t
61 61
62from efl.eo cimport _object_mapping_register 62from efl.eo cimport _object_mapping_register
63from efl.utils.conversions cimport _ctouni
64from efl.evas cimport Object as evasObject 63from efl.evas cimport Object as evasObject
65from object cimport Object 64from object cimport Object
66from object_item cimport _object_item_to_python, _object_item_callback, \ 65from object_item cimport _object_item_to_python, _object_item_callback, \
67 _object_item_list_to_python, _object_item_callback2 66 _object_item_list_to_python, _object_item_callback2, ObjectItem
68 67
69def _cb_object_item_conv(uintptr_t addr): 68def _cb_object_item_conv(uintptr_t addr):
70 cdef Elm_Object_Item *it = <Elm_Object_Item *>addr 69 cdef Elm_Object_Item *it = <Elm_Object_Item *>addr
diff --git a/efl/elementary/frame.pyx b/efl/elementary/frame.pyx
index d04f90d..a35e5ba 100644
--- a/efl/elementary/frame.pyx
+++ b/efl/elementary/frame.pyx
@@ -53,10 +53,7 @@ Default text parts of the frame widget that you can use for are:
53 53
54""" 54"""
55 55
56from cpython cimport PyUnicode_AsUTF8String
57
58from efl.eo cimport _object_mapping_register 56from efl.eo cimport _object_mapping_register
59from efl.utils.conversions cimport _ctouni
60from efl.evas cimport Object as evasObject 57from efl.evas cimport Object as evasObject
61from layout_class cimport LayoutClass 58from layout_class cimport LayoutClass
62 59
diff --git a/efl/elementary/general.pxd b/efl/elementary/general.pxd
index c8de1ef..bad7859 100644
--- a/efl/elementary/general.pxd
+++ b/efl/elementary/general.pxd
@@ -17,13 +17,8 @@
17# 17#
18 18
19from efl.evas cimport Eina_List, Eina_Bool 19from efl.evas cimport Eina_List, Eina_Bool
20from efl.evas cimport Evas_Object, Evas_Smart_Cb, Evas_Font_Size, Evas_Coord 20from efl.evas cimport Evas_Object, Evas_Font_Size, Evas_Coord
21from efl.evas.enums cimport Evas_Callback_Type 21from efl.evas.enums cimport Evas_Callback_Type
22#from efl.evas cimport Evas_Load_Error
23#from efl.evas cimport Evas_Event_Flags
24from enums cimport Elm_Policy, Elm_Policy_Quit
25from libc.string cimport memcpy, strdup
26from libc.stdlib cimport free
27 22
28cdef extern from "time.h": 23cdef extern from "time.h":
29 struct tm: 24 struct tm:
diff --git a/efl/elementary/general.pyx b/efl/elementary/general.pyx
index 207ffcd..8f17969 100644
--- a/efl/elementary/general.pyx
+++ b/efl/elementary/general.pyx
@@ -119,9 +119,8 @@ Possible values for the #ELM_POLICY_THROTTLE policy.
119 119
120""" 120"""
121 121
122from cpython cimport PyObject, Py_INCREF, Py_DECREF, PyUnicode_AsUTF8String, \ 122from cpython cimport PyUnicode_AsUTF8String, PyMem_Malloc, Py_DECREF
123 PyMem_Malloc, PyMem_Free 123from libc.string cimport memcpy
124from libc.stdint cimport uintptr_t
125 124
126from efl.evas cimport Object as evasObject 125from efl.evas cimport Object as evasObject
127 126
@@ -134,8 +133,9 @@ from efl.utils.logger cimport add_logger
134from efl.eina cimport EINA_LOG_DOM_DBG, EINA_LOG_DOM_INFO, \ 133from efl.eina cimport EINA_LOG_DOM_DBG, EINA_LOG_DOM_INFO, \
135 EINA_LOG_DOM_WARN, EINA_LOG_DOM_ERR, EINA_LOG_DOM_CRIT 134 EINA_LOG_DOM_WARN, EINA_LOG_DOM_ERR, EINA_LOG_DOM_CRIT
136 135
136from enums cimport Elm_Policy
137
137import sys 138import sys
138import traceback
139 139
140cimport enums 140cimport enums
141 141
diff --git a/efl/elementary/gengrid.pxd b/efl/elementary/gengrid.pxd
index 10b994a..ac1054f 100644
--- a/efl/elementary/gengrid.pxd
+++ b/efl/elementary/gengrid.pxd
@@ -2,8 +2,7 @@ from efl.evas cimport Eina_Bool, Eina_List, Evas_Object, Evas_Smart_Cb, \
2 Evas_Coord, Eina_Compare_Cb 2 Evas_Coord, Eina_Compare_Cb
3from object_item cimport Elm_Object_Item 3from object_item cimport Elm_Object_Item
4from general cimport Elm_Tooltip_Item_Content_Cb 4from general cimport Elm_Tooltip_Item_Content_Cb
5from enums cimport Elm_Genlist_Item_Scrollto_Type, Elm_Scroller_Policy, \ 5from enums cimport Elm_Genlist_Item_Scrollto_Type, Elm_Object_Select_Mode
6 Elm_Object_Select_Mode
7 6
8cdef extern from "Elementary.h": 7cdef extern from "Elementary.h":
9 ctypedef char *(*GengridItemLabelGetFunc) (void *data, Evas_Object *obj, const char *part) 8 ctypedef char *(*GengridItemLabelGetFunc) (void *data, Evas_Object *obj, const char *part)
diff --git a/efl/elementary/genlist.pxd b/efl/elementary/genlist.pxd
index 9a74404..7941c48 100644
--- a/efl/elementary/genlist.pxd
+++ b/efl/elementary/genlist.pxd
@@ -1,9 +1,8 @@
1from efl.evas cimport Eina_Bool, Eina_List, Eina_Compare_Cb, \ 1from efl.evas cimport Eina_Bool, Eina_List, Eina_Compare_Cb, \
2 Evas_Object, Evas_Smart_Cb, Evas_Coord 2 Evas_Object, Evas_Smart_Cb, Evas_Coord
3from object cimport Object
4from object_item cimport Elm_Object_Item 3from object_item cimport Elm_Object_Item
5from general cimport Elm_Tooltip_Item_Content_Cb 4from general cimport Elm_Tooltip_Item_Content_Cb
6from enums cimport Elm_Scroller_Policy, Elm_List_Mode, Elm_Object_Select_Mode, \ 5from enums cimport Elm_List_Mode, Elm_Object_Select_Mode, \
7 Elm_Genlist_Item_Type, Elm_Genlist_Item_Scrollto_Type, \ 6 Elm_Genlist_Item_Type, Elm_Genlist_Item_Scrollto_Type, \
8 Elm_Genlist_Item_Field_Type 7 Elm_Genlist_Item_Field_Type
9 8
diff --git a/efl/elementary/genlist.pyx b/efl/elementary/genlist.pyx
index 998f762..a8bf1e8 100644
--- a/efl/elementary/genlist.pyx
+++ b/efl/elementary/genlist.pyx
@@ -509,7 +509,6 @@ include "tooltips.pxi"
509from cpython cimport PyUnicode_AsUTF8String, Py_DECREF, Py_INCREF 509from cpython cimport PyUnicode_AsUTF8String, Py_DECREF, Py_INCREF
510from libc.stdint cimport uintptr_t 510from libc.stdint cimport uintptr_t
511 511
512from efl.eo cimport _object_mapping_register, PY_REFCOUNT
513from efl.utils.conversions cimport _ctouni 512from efl.utils.conversions cimport _ctouni
514from efl.evas cimport Object as evasObject 513from efl.evas cimport Object as evasObject
515 514
@@ -520,7 +519,8 @@ from scroller cimport elm_scroller_policy_get, elm_scroller_policy_set, \
520from object_item cimport ObjectItem, _object_item_to_python, \ 519from object_item cimport ObjectItem, _object_item_to_python, \
521 elm_object_item_widget_get, _object_item_from_python, \ 520 elm_object_item_widget_get, _object_item_from_python, \
522 _object_item_list_to_python, elm_object_item_data_get 521 _object_item_list_to_python, elm_object_item_data_get
523from general cimport strdup 522from libc.string cimport strdup
523from object cimport Object
524 524
525from general cimport PY_EFL_ELM_LOG_DOMAIN 525from general cimport PY_EFL_ELM_LOG_DOMAIN
526from efl.eina cimport EINA_LOG_DOM_DBG, EINA_LOG_DOM_INFO, EINA_LOG_DOM_WARN, \ 526from efl.eina cimport EINA_LOG_DOM_DBG, EINA_LOG_DOM_INFO, EINA_LOG_DOM_WARN, \
diff --git a/efl/elementary/genlist_widget.pxi b/efl/elementary/genlist_widget.pxi
index 24037c7..6a3c1d3 100644
--- a/efl/elementary/genlist_widget.pxi
+++ b/efl/elementary/genlist_widget.pxi
@@ -1,3 +1,5 @@
1from efl.eo cimport _object_mapping_register, PY_REFCOUNT
2
1#include "cnp_callbacks.pxi" 3#include "cnp_callbacks.pxi"
2 4
3cdef class Genlist(Object): 5cdef class Genlist(Object):
diff --git a/efl/elementary/gesture_layer.pyx b/efl/elementary/gesture_layer.pyx
index 26896d4..7637220 100644
--- a/efl/elementary/gesture_layer.pyx
+++ b/efl/elementary/gesture_layer.pyx
@@ -157,10 +157,9 @@ Gesture types
157 157
158""" 158"""
159 159
160from cpython cimport PyUnicode_AsUTF8String, Py_INCREF 160from cpython cimport Py_INCREF
161 161
162from efl.eo cimport _object_mapping_register 162from efl.eo cimport _object_mapping_register
163from efl.utils.conversions cimport _ctouni
164from efl.evas cimport Object as evasObject 163from efl.evas cimport Object as evasObject
165from object cimport Object 164from object cimport Object
166 165
diff --git a/efl/elementary/glview.pyx b/efl/elementary/glview.pyx
index 82fc40b..ea2930c 100644
--- a/efl/elementary/glview.pyx
+++ b/efl/elementary/glview.pyx
@@ -113,7 +113,6 @@ only when it is visible.
113""" 113"""
114 114
115from efl.eo cimport _object_mapping_register, object_from_instance 115from efl.eo cimport _object_mapping_register, object_from_instance
116from efl.utils.conversions cimport _ctouni
117from efl.evas cimport Object as evasObject 116from efl.evas cimport Object as evasObject
118from layout_class cimport LayoutClass 117from layout_class cimport LayoutClass
119 118
diff --git a/efl/elementary/hover.pyx b/efl/elementary/hover.pyx
index 4b21614..c18445b 100644
--- a/efl/elementary/hover.pyx
+++ b/efl/elementary/hover.pyx
@@ -112,8 +112,6 @@ Hover axis
112 112
113""" 113"""
114 114
115from cpython cimport PyUnicode_AsUTF8String
116
117from efl.eo cimport _object_mapping_register, object_from_instance 115from efl.eo cimport _object_mapping_register, object_from_instance
118from efl.utils.conversions cimport _ctouni 116from efl.utils.conversions cimport _ctouni
119from efl.evas cimport Object as evasObject 117from efl.evas cimport Object as evasObject
diff --git a/efl/elementary/hoversel.pyx b/efl/elementary/hoversel.pyx
index bc0dc52..f7ac9fb 100644
--- a/efl/elementary/hoversel.pyx
+++ b/efl/elementary/hoversel.pyx
@@ -73,7 +73,7 @@ Icon types
73 73
74""" 74"""
75 75
76from cpython cimport PyUnicode_AsUTF8String, Py_DECREF 76from cpython cimport PyUnicode_AsUTF8String
77from libc.stdint cimport uintptr_t 77from libc.stdint cimport uintptr_t
78 78
79from efl.eo cimport _object_mapping_register, object_from_instance 79from efl.eo cimport _object_mapping_register, object_from_instance
diff --git a/efl/elementary/icon.pxd b/efl/elementary/icon.pxd
index 36c8f58..bd1ea42 100644
--- a/efl/elementary/icon.pxd
+++ b/efl/elementary/icon.pxd
@@ -1,6 +1,5 @@
1from efl.evas cimport Eina_Bool, Evas_Object 1from efl.evas cimport Eina_Bool, Evas_Object
2from image cimport Image 2from enums cimport Elm_Icon_Lookup_Order
3from enums cimport Elm_Icon_Lookup_Order, Elm_Icon_Type
4 3
5cdef extern from "Elementary.h": 4cdef extern from "Elementary.h":
6 Evas_Object * elm_icon_add(Evas_Object *parent) 5 Evas_Object * elm_icon_add(Evas_Object *parent)
diff --git a/efl/elementary/icon.pyx b/efl/elementary/icon.pyx
index 5f888b2..5825799 100644
--- a/efl/elementary/icon.pyx
+++ b/efl/elementary/icon.pyx
@@ -146,6 +146,7 @@ from cpython cimport PyUnicode_AsUTF8String
146from efl.eo cimport _object_mapping_register 146from efl.eo cimport _object_mapping_register
147from efl.utils.conversions cimport _ctouni 147from efl.utils.conversions cimport _ctouni
148from efl.evas cimport Object as evasObject 148from efl.evas cimport Object as evasObject
149from image cimport Image
149 150
150cimport enums 151cimport enums
151 152
diff --git a/efl/elementary/index.pxd b/efl/elementary/index.pxd
index 6755665..dcf9833 100644
--- a/efl/elementary/index.pxd
+++ b/efl/elementary/index.pxd
@@ -1,6 +1,5 @@
1from efl.evas cimport Eina_Bool, Eina_Compare_Cb, Evas_Object, Evas_Smart_Cb 1from efl.evas cimport Eina_Bool, Eina_Compare_Cb, Evas_Object, Evas_Smart_Cb
2from object cimport Object 2from object_item cimport Elm_Object_Item
3from object_item cimport Elm_Object_Item, ObjectItem
4 3
5cdef extern from "Elementary.h": 4cdef extern from "Elementary.h":
6 Evas_Object *elm_index_add(Evas_Object *parent) 5 Evas_Object *elm_index_add(Evas_Object *parent)
diff --git a/efl/elementary/index.pyx b/efl/elementary/index.pyx
index 8c95471..dfd7d78 100644
--- a/efl/elementary/index.pyx
+++ b/efl/elementary/index.pyx
@@ -65,7 +65,7 @@ actually be reported.
65 65
66""" 66"""
67 67
68from cpython cimport PyUnicode_AsUTF8String, Py_DECREF 68from cpython cimport PyUnicode_AsUTF8String
69from libc.stdint cimport uintptr_t 69from libc.stdint cimport uintptr_t
70 70
71from efl.eo cimport _object_mapping_register 71from efl.eo cimport _object_mapping_register
@@ -73,8 +73,8 @@ from efl.utils.conversions cimport _ctouni
73from efl.utils.deprecated cimport DEPRECATED 73from efl.utils.deprecated cimport DEPRECATED
74from efl.evas cimport Object as evasObject 74from efl.evas cimport Object as evasObject
75from layout_class cimport LayoutClass 75from layout_class cimport LayoutClass
76from object_item cimport _object_item_callback, _object_item_to_python, \ 76from object_item cimport _object_item_to_python, elm_object_item_data_get, \
77 elm_object_item_data_get, _object_item_callback2 77 _object_item_callback2, ObjectItem
78 78
79import traceback 79import traceback
80 80
diff --git a/efl/elementary/label.pyx b/efl/elementary/label.pyx
index 6bf5ca0..85935da 100644
--- a/efl/elementary/label.pyx
+++ b/efl/elementary/label.pyx
@@ -95,10 +95,7 @@ Slide modes
95 95
96""" 96"""
97 97
98from cpython cimport PyUnicode_AsUTF8String
99
100from efl.eo cimport _object_mapping_register 98from efl.eo cimport _object_mapping_register
101from efl.utils.conversions cimport _ctouni
102from efl.evas cimport Object as evasObject 99from efl.evas cimport Object as evasObject
103from layout_class cimport LayoutClass 100from layout_class cimport LayoutClass
104from efl.utils.deprecated cimport DEPRECATED 101from efl.utils.deprecated cimport DEPRECATED
diff --git a/efl/elementary/layout.pxd b/efl/elementary/layout.pxd
index d01c05a..f4ecacf 100644
--- a/efl/elementary/layout.pxd
+++ b/efl/elementary/layout.pxd
@@ -1,4 +1,4 @@
1from efl.evas cimport Evas_Object, Eina_Bool 1from efl.evas cimport Evas_Object
2 2
3cdef extern from "Elementary.h": 3cdef extern from "Elementary.h":
4 Evas_Object * elm_layout_add(Evas_Object *parent) 4 Evas_Object * elm_layout_add(Evas_Object *parent)
diff --git a/efl/elementary/layout.pyx b/efl/elementary/layout.pyx
index de6978f..81e0449 100644
--- a/efl/elementary/layout.pyx
+++ b/efl/elementary/layout.pyx
@@ -137,10 +137,7 @@ This widget emits the following signals:
137 137
138""" 138"""
139 139
140from cpython cimport PyUnicode_AsUTF8String 140from efl.eo cimport _object_mapping_register
141
142from efl.eo cimport _object_mapping_register, object_from_instance
143from efl.utils.conversions cimport _ctouni
144from efl.evas cimport Object as evasObject 141from efl.evas cimport Object as evasObject
145from layout_class cimport LayoutClass 142from layout_class cimport LayoutClass
146 143
diff --git a/efl/elementary/list.pxd b/efl/elementary/list.pxd
index 7c51747..1ea88b6 100644
--- a/efl/elementary/list.pxd
+++ b/efl/elementary/list.pxd
@@ -1,7 +1,7 @@
1from efl.evas cimport Eina_Bool, Eina_List, Eina_Compare_Cb, \ 1from efl.evas cimport Eina_Bool, Eina_List, Eina_Compare_Cb, \
2 Evas_Object, Evas_Smart_Cb, Evas_Coord 2 Evas_Object, Evas_Smart_Cb, Evas_Coord
3from object_item cimport Elm_Object_Item, ObjectItem 3from object_item cimport Elm_Object_Item
4from enums cimport Elm_List_Mode, Elm_Object_Select_Mode, Elm_Scroller_Policy 4from enums cimport Elm_List_Mode, Elm_Object_Select_Mode
5 5
6cdef extern from "Elementary.h": 6cdef extern from "Elementary.h":
7 Evas_Object *elm_list_add(Evas_Object *parent) 7 Evas_Object *elm_list_add(Evas_Object *parent)
diff --git a/efl/elementary/list.pyx b/efl/elementary/list.pyx
index 28a50bd..4abbe09 100644
--- a/efl/elementary/list.pyx
+++ b/efl/elementary/list.pyx
@@ -158,15 +158,14 @@ Selection modes
158 158
159""" 159"""
160 160
161from cpython cimport PyUnicode_AsUTF8String, Py_DECREF 161from cpython cimport PyUnicode_AsUTF8String
162from libc.stdint cimport uintptr_t 162from libc.stdint cimport uintptr_t
163 163
164from efl.eo cimport _object_mapping_register, object_from_instance, PY_REFCOUNT 164from efl.eo cimport _object_mapping_register, object_from_instance, PY_REFCOUNT
165from efl.utils.conversions cimport _ctouni
166from efl.evas cimport Object as evasObject 165from efl.evas cimport Object as evasObject
167from object cimport Object 166from object cimport Object
168from object_item cimport _object_item_callback, _object_item_callback2, \ 167from object_item cimport _object_item_callback, _object_item_callback2, \
169 _object_item_to_python, _object_item_list_to_python 168 _object_item_to_python, _object_item_list_to_python, ObjectItem
170 169
171from efl.utils.deprecated cimport DEPRECATED 170from efl.utils.deprecated cimport DEPRECATED
172from scroller cimport elm_scroller_policy_get, elm_scroller_policy_set, \ 171from scroller cimport elm_scroller_policy_get, elm_scroller_policy_set, \
diff --git a/efl/elementary/menu.pxd b/efl/elementary/menu.pxd
index 0660ed4..7676800 100644
--- a/efl/elementary/menu.pxd
+++ b/efl/elementary/menu.pxd
@@ -1,7 +1,7 @@
1from efl.evas cimport Eina_Bool, Eina_List, Evas_Object, Evas_Coord, \ 1from efl.evas cimport Eina_Bool, Eina_List, Evas_Object, Evas_Coord, \
2 Evas_Smart_Cb 2 Evas_Smart_Cb
3from object cimport Object 3from object cimport Object
4from object_item cimport Elm_Object_Item, ObjectItem 4from object_item cimport Elm_Object_Item
5 5
6cdef extern from "Elementary.h": 6cdef extern from "Elementary.h":
7 Evas_Object *elm_menu_add(Evas_Object *parent) 7 Evas_Object *elm_menu_add(Evas_Object *parent)
diff --git a/efl/elementary/menu.pyx b/efl/elementary/menu.pyx
index 188283a..9916723 100644
--- a/efl/elementary/menu.pyx
+++ b/efl/elementary/menu.pyx
@@ -44,13 +44,13 @@ Default text parts of the menu items that you can use for are:
44 44
45""" 45"""
46 46
47from cpython cimport PyUnicode_AsUTF8String, Py_DECREF 47from cpython cimport PyUnicode_AsUTF8String
48 48
49from efl.eo cimport _object_mapping_register, object_from_instance 49from efl.eo cimport _object_mapping_register, object_from_instance
50from efl.utils.conversions cimport _ctouni 50from efl.utils.conversions cimport _ctouni
51from efl.evas cimport Object as evasObject 51from efl.evas cimport Object as evasObject
52from object_item cimport _object_item_callback, _object_item_list_to_python, \ 52from object_item cimport _object_item_callback, _object_item_list_to_python, \
53 _object_item_to_python, _object_item_callback2 53 _object_item_to_python, _object_item_callback2, ObjectItem
54 54
55cdef class MenuItem(ObjectItem): 55cdef class MenuItem(ObjectItem):
56 56
diff --git a/efl/elementary/multibuttonentry.pxd b/efl/elementary/multibuttonentry.pxd
index 2c4bc36..14693d5 100644
--- a/efl/elementary/multibuttonentry.pxd
+++ b/efl/elementary/multibuttonentry.pxd
@@ -1,5 +1,5 @@
1from efl.evas cimport Eina_Bool, Eina_List, Evas_Object, Evas_Smart_Cb 1from efl.evas cimport Eina_Bool, Eina_List, Evas_Object, Evas_Smart_Cb
2from object_item cimport Elm_Object_Item, ObjectItem 2from object_item cimport Elm_Object_Item
3 3
4cdef extern from "Elementary.h": 4cdef extern from "Elementary.h":
5 5
diff --git a/efl/elementary/multibuttonentry.pyx b/efl/elementary/multibuttonentry.pyx
index ce7f916..1935ebe 100644
--- a/efl/elementary/multibuttonentry.pyx
+++ b/efl/elementary/multibuttonentry.pyx
@@ -62,19 +62,18 @@ Default text parts of the multibuttonentry items that you can use for are:
62 62
63""" 63"""
64 64
65from cpython cimport PyUnicode_AsUTF8String, Py_DECREF, Py_INCREF 65from cpython cimport PyUnicode_AsUTF8String, Py_INCREF
66from libc.stdint cimport uintptr_t 66from libc.stdint cimport uintptr_t
67 67
68from efl.eo cimport _object_mapping_register, object_from_instance, PY_REFCOUNT 68from efl.eo cimport _object_mapping_register, object_from_instance, PY_REFCOUNT
69from efl.utils.conversions cimport _ctouni 69from efl.utils.conversions cimport _ctouni
70from efl.evas cimport Object as evasObject 70from efl.evas cimport Object as evasObject
71 71
72from libc.stdlib cimport free
73from libc.string cimport strdup 72from libc.string cimport strdup
74from object cimport Object 73from object cimport Object
75import traceback 74import traceback
76from object_item cimport _object_item_callback, _object_item_callback2, \ 75from object_item cimport _object_item_callback, _object_item_callback2, \
77 _object_item_to_python, _object_item_list_to_python 76 _object_item_to_python, _object_item_list_to_python, ObjectItem
78 77
79cdef Eina_Bool _multibuttonentry_filter_callback(Evas_Object *obj, \ 78cdef Eina_Bool _multibuttonentry_filter_callback(Evas_Object *obj, \
80 const char *item_label, void *item_data, void *data) with gil: 79 const char *item_label, void *item_data, void *data) with gil:
diff --git a/efl/elementary/naviframe.pxd b/efl/elementary/naviframe.pxd
index 2e49744..8afc192 100644
--- a/efl/elementary/naviframe.pxd
+++ b/efl/elementary/naviframe.pxd
@@ -1,5 +1,5 @@
1from efl.evas cimport Evas_Object, Eina_Bool, Eina_List 1from efl.evas cimport Evas_Object, Eina_Bool, Eina_List
2from object_item cimport Elm_Object_Item, ObjectItem 2from object_item cimport Elm_Object_Item
3 3
4cdef extern from "Elementary.h": 4cdef extern from "Elementary.h":
5 Evas_Object *elm_naviframe_add(Evas_Object *parent) 5 Evas_Object *elm_naviframe_add(Evas_Object *parent)
diff --git a/efl/elementary/naviframe.pyx b/efl/elementary/naviframe.pyx
index 2aff9e7..e8f52d4 100644
--- a/efl/elementary/naviframe.pyx
+++ b/efl/elementary/naviframe.pyx
@@ -100,8 +100,8 @@ from efl.utils.conversions cimport _ctouni
100from efl.evas cimport Object as evasObject 100from efl.evas cimport Object as evasObject
101from layout_class cimport LayoutClass 101from layout_class cimport LayoutClass
102 102
103from object_item cimport _object_item_to_python, \ 103from object_item cimport _object_item_to_python, _object_item_list_to_python, \
104 _object_item_list_to_python 104 ObjectItem
105 105
106from efl.utils.deprecated cimport DEPRECATED 106from efl.utils.deprecated cimport DEPRECATED
107 107
diff --git a/efl/elementary/notify.pxd b/efl/elementary/notify.pxd
index 7a2c518..795c29a 100644
--- a/efl/elementary/notify.pxd
+++ b/efl/elementary/notify.pxd
@@ -1,5 +1,4 @@
1from efl.evas cimport Eina_Bool, Evas_Object 1from efl.evas cimport Eina_Bool, Evas_Object
2from enums cimport Elm_Notify_Orient
3 2
4cdef extern from "Elementary.h": 3cdef extern from "Elementary.h":
5 Evas_Object *elm_notify_add(Evas_Object *parent) 4 Evas_Object *elm_notify_add(Evas_Object *parent)
diff --git a/efl/elementary/notify.pyx b/efl/elementary/notify.pyx
index 49793cf..9a616e8 100644
--- a/efl/elementary/notify.pyx
+++ b/efl/elementary/notify.pyx
@@ -54,10 +54,7 @@ ELM_NOTIFY_ALIGN_FILL
54 54
55""" 55"""
56 56
57from cpython cimport PyUnicode_AsUTF8String
58
59from efl.eo cimport _object_mapping_register, object_from_instance 57from efl.eo cimport _object_mapping_register, object_from_instance
60from efl.utils.conversions cimport _ctouni
61from efl.evas cimport Object as evasObject 58from efl.evas cimport Object as evasObject
62from object cimport Object 59from object cimport Object
63from efl.utils.deprecated cimport DEPRECATED 60from efl.utils.deprecated cimport DEPRECATED
diff --git a/efl/elementary/object.pxd b/efl/elementary/object.pxd
index 1ddf628..b72a5ab 100644
--- a/efl/elementary/object.pxd
+++ b/efl/elementary/object.pxd
@@ -15,7 +15,6 @@
15# You should have received a copy of the GNU Lesser General Public License 15# You should have received a copy of the GNU Lesser General Public License
16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>. 16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>.
17 17
18from cpython cimport PyObject, Py_INCREF, Py_DECREF
19from efl.evas cimport Eina_Bool, Eina_List, \ 18from efl.evas cimport Eina_Bool, Eina_List, \
20 Evas_Object, Evas_Smart_Cb, Evas_Coord 19 Evas_Object, Evas_Smart_Cb, Evas_Coord
21from efl.evas.enums cimport Evas_Callback_Type 20from efl.evas.enums cimport Evas_Callback_Type
diff --git a/efl/elementary/object_item.pyx b/efl/elementary/object_item.pyx
index a8f0821..deea663 100644
--- a/efl/elementary/object_item.pyx
+++ b/efl/elementary/object_item.pyx
@@ -18,7 +18,7 @@
18from cpython cimport PyUnicode_AsUTF8String, Py_DECREF, Py_INCREF 18from cpython cimport PyUnicode_AsUTF8String, Py_DECREF, Py_INCREF
19from libc.stdint cimport uintptr_t 19from libc.stdint cimport uintptr_t
20 20
21from efl.eo cimport _object_mapping_register, object_from_instance, PY_REFCOUNT 21from efl.eo cimport PY_REFCOUNT
22from efl.utils.conversions cimport _ctouni 22from efl.utils.conversions cimport _ctouni
23from efl.utils.deprecated cimport DEPRECATED 23from efl.utils.deprecated cimport DEPRECATED
24from efl.evas cimport Object as evasObject 24from efl.evas cimport Object as evasObject
@@ -32,8 +32,6 @@ include "tooltips.pxi"
32# cdef void _tooltip_item_data_del_cb(void *data, Evas_Object *o, void *event_info) with gil: 32# cdef void _tooltip_item_data_del_cb(void *data, Evas_Object *o, void *event_info) with gil:
33# Py_DECREF(<object>data) 33# Py_DECREF(<object>data)
34 34
35from efl.utils.conversions cimport python_list_objects_to_eina_list, \
36 eina_list_objects_to_python_list
37from object cimport Object 35from object cimport Object
38import traceback 36import traceback
39 37
diff --git a/efl/elementary/panel.pyx b/efl/elementary/panel.pyx
index 4788136..8ea1659 100644
--- a/efl/elementary/panel.pyx
+++ b/efl/elementary/panel.pyx
@@ -73,7 +73,6 @@ Panel orientation types
73 73
74from efl.eo cimport _object_mapping_register 74from efl.eo cimport _object_mapping_register
75from efl.evas cimport Object as evasObject 75from efl.evas cimport Object as evasObject
76from object cimport Object
77from layout_class cimport LayoutClass 76from layout_class cimport LayoutClass
78 77
79cimport enums 78cimport enums
diff --git a/efl/elementary/photo.pyx b/efl/elementary/photo.pyx
index 0f6a9f2..7be13c3 100644
--- a/efl/elementary/photo.pyx
+++ b/efl/elementary/photo.pyx
@@ -44,7 +44,6 @@ Signals that you can add callbacks for are:
44from cpython cimport PyUnicode_AsUTF8String 44from cpython cimport PyUnicode_AsUTF8String
45 45
46from efl.eo cimport _object_mapping_register 46from efl.eo cimport _object_mapping_register
47from efl.utils.conversions cimport _ctouni
48from efl.evas cimport Object as evasObject 47from efl.evas cimport Object as evasObject
49from object cimport Object 48from object cimport Object
50 49
diff --git a/efl/elementary/plug.pyx b/efl/elementary/plug.pyx
index b654978..24f71b6 100644
--- a/efl/elementary/plug.pyx
+++ b/efl/elementary/plug.pyx
@@ -42,12 +42,9 @@ This widget emits the following signals:
42from cpython cimport PyUnicode_AsUTF8String 42from cpython cimport PyUnicode_AsUTF8String
43 43
44from efl.eo cimport _object_mapping_register, object_from_instance 44from efl.eo cimport _object_mapping_register, object_from_instance
45from efl.utils.conversions cimport _ctouni
46from efl.evas cimport Object as evasObject 45from efl.evas cimport Object as evasObject
47from object cimport Object 46from object cimport Object
48 47
49from efl.evas cimport Image as evasImage
50
51cdef class Plug(Object): 48cdef class Plug(Object):
52 49
53 """ 50 """
diff --git a/efl/elementary/popup.pxd b/efl/elementary/popup.pxd
index 9a9cc8c..ce988dc 100644
--- a/efl/elementary/popup.pxd
+++ b/efl/elementary/popup.pxd
@@ -1,5 +1,5 @@
1from efl.evas cimport Eina_Bool, Evas_Object, Evas_Smart_Cb 1from efl.evas cimport Eina_Bool, Evas_Object, Evas_Smart_Cb
2from object_item cimport Elm_Object_Item, ObjectItem 2from object_item cimport Elm_Object_Item
3from enums cimport Elm_Wrap_Type, Elm_Popup_Orient 3from enums cimport Elm_Wrap_Type, Elm_Popup_Orient
4 4
5cdef extern from "Elementary.h": 5cdef extern from "Elementary.h":
diff --git a/efl/elementary/popup.pyx b/efl/elementary/popup.pyx
index 1f7641f..d5cd153 100644
--- a/efl/elementary/popup.pyx
+++ b/efl/elementary/popup.pyx
@@ -179,16 +179,14 @@ Wrap modes
179 179
180""" 180"""
181 181
182from cpython cimport PyUnicode_AsUTF8String, Py_DECREF 182from cpython cimport PyUnicode_AsUTF8String
183from libc.stdint cimport uintptr_t 183from libc.stdint cimport uintptr_t
184 184
185from efl.eo cimport _object_mapping_register, PY_REFCOUNT 185from efl.eo cimport _object_mapping_register, PY_REFCOUNT
186from efl.utils.conversions cimport _ctouni
187from efl.evas cimport Object as evasObject 186from efl.evas cimport Object as evasObject
188from object cimport Object
189from layout_class cimport LayoutClass 187from layout_class cimport LayoutClass
190from object_item cimport _object_item_callback, _object_item_callback2, \ 188from object_item cimport _object_item_callback, _object_item_callback2, \
191 _object_item_to_python 189 ObjectItem
192 190
193cimport enums 191cimport enums
194 192
diff --git a/efl/elementary/progressbar.pyx b/efl/elementary/progressbar.pyx
index a819aad..bd4aaec 100644
--- a/efl/elementary/progressbar.pyx
+++ b/efl/elementary/progressbar.pyx
@@ -80,8 +80,6 @@ from efl.eo cimport _object_mapping_register
80from efl.utils.conversions cimport _ctouni 80from efl.utils.conversions cimport _ctouni
81from efl.evas cimport Object as evasObject 81from efl.evas cimport Object as evasObject
82from layout_class cimport LayoutClass 82from layout_class cimport LayoutClass
83from object cimport Object
84
85 83
86cdef class Progressbar(LayoutClass): 84cdef class Progressbar(LayoutClass):
87 85
diff --git a/efl/elementary/scroller.pyx b/efl/elementary/scroller.pyx
index b20a110..6d87149 100644
--- a/efl/elementary/scroller.pyx
+++ b/efl/elementary/scroller.pyx
@@ -142,9 +142,8 @@ Type that blocks the scroll movement in one or more direction.
142 142
143from cpython cimport PyUnicode_AsUTF8String 143from cpython cimport PyUnicode_AsUTF8String
144 144
145from efl.evas cimport Evas_Object, Object as evasObject 145from efl.evas cimport Object as evasObject
146from efl.eo cimport object_from_instance, _object_mapping_register 146from efl.eo cimport _object_mapping_register
147from efl.utils.conversions cimport _ctouni, _touni
148 147
149from object cimport Object 148from object cimport Object
150from layout_class cimport LayoutClass 149from layout_class cimport LayoutClass
diff --git a/efl/elementary/segment_control.pxd b/efl/elementary/segment_control.pxd
index 3ada46a..88dbee7 100644
--- a/efl/elementary/segment_control.pxd
+++ b/efl/elementary/segment_control.pxd
@@ -1,5 +1,5 @@
1from efl.evas cimport Eina_Bool, Evas_Object 1from efl.evas cimport Eina_Bool, Evas_Object
2from object_item cimport Elm_Object_Item, ObjectItem 2from object_item cimport Elm_Object_Item
3 3
4cdef extern from "Elementary.h": 4cdef extern from "Elementary.h":
5 Evas_Object *elm_segment_control_add(Evas_Object *parent) 5 Evas_Object *elm_segment_control_add(Evas_Object *parent)
diff --git a/efl/elementary/segment_control.pyx b/efl/elementary/segment_control.pyx
index 3e2996d..73cf326 100644
--- a/efl/elementary/segment_control.pyx
+++ b/efl/elementary/segment_control.pyx
@@ -61,7 +61,7 @@ from efl.utils.conversions cimport _ctouni
61from efl.evas cimport Object as evasObject 61from efl.evas cimport Object as evasObject
62from layout_class cimport LayoutClass 62from layout_class cimport LayoutClass
63 63
64from object_item cimport _object_item_to_python 64from object_item cimport _object_item_to_python, ObjectItem
65 65
66def _cb_object_item_conv(uintptr_t addr): 66def _cb_object_item_conv(uintptr_t addr):
67 cdef Elm_Object_Item *it = <Elm_Object_Item *>addr 67 cdef Elm_Object_Item *it = <Elm_Object_Item *>addr
diff --git a/efl/elementary/slideshow.pxd b/efl/elementary/slideshow.pxd
index 0e83122..9a92ec2 100644
--- a/efl/elementary/slideshow.pxd
+++ b/efl/elementary/slideshow.pxd
@@ -1,5 +1,5 @@
1from efl.evas cimport Eina_Bool, Eina_Compare_Cb, Eina_List, Evas_Object 1from efl.evas cimport Eina_Bool, Eina_Compare_Cb, Eina_List, Evas_Object
2from object_item cimport Elm_Object_Item, ObjectItem 2from object_item cimport Elm_Object_Item
3 3
4cdef extern from "Elementary.h": 4cdef extern from "Elementary.h":
5 5
diff --git a/efl/elementary/slideshow.pyx b/efl/elementary/slideshow.pyx
index eb711e9..1c2023d 100644
--- a/efl/elementary/slideshow.pyx
+++ b/efl/elementary/slideshow.pyx
@@ -78,7 +78,7 @@ This widget emits the following signals, besides the ones sent from
78 78
79""" 79"""
80 80
81from cpython cimport PyUnicode_AsUTF8String, Py_INCREF, Py_DECREF 81from cpython cimport PyUnicode_AsUTF8String, Py_INCREF
82from libc.stdint cimport uintptr_t 82from libc.stdint cimport uintptr_t
83 83
84from efl.eo cimport _object_mapping_register, object_from_instance, PY_REFCOUNT 84from efl.eo cimport _object_mapping_register, object_from_instance, PY_REFCOUNT
@@ -89,7 +89,8 @@ from efl.utils.conversions cimport eina_list_strings_to_python_list
89from layout_class cimport LayoutClass 89from layout_class cimport LayoutClass
90 90
91import traceback 91import traceback
92from object_item cimport _object_item_to_python, _object_item_list_to_python 92from object_item cimport _object_item_to_python, _object_item_list_to_python, \
93 ObjectItem
93 94
94def _cb_object_item_conv(uintptr_t addr): 95def _cb_object_item_conv(uintptr_t addr):
95 cdef Elm_Object_Item *it = <Elm_Object_Item *>addr 96 cdef Elm_Object_Item *it = <Elm_Object_Item *>addr
diff --git a/efl/elementary/store.pyx b/efl/elementary/store.pyx
index 192c9d0..ba36d63 100644
--- a/efl/elementary/store.pyx
+++ b/efl/elementary/store.pyx
@@ -106,7 +106,6 @@ Enumerations
106from libc.string cimport strdup 106from libc.string cimport strdup
107from cpython cimport Py_INCREF, Py_DECREF 107from cpython cimport Py_INCREF, Py_DECREF
108from efl.eo cimport _ctouni, _touni 108from efl.eo cimport _ctouni, _touni
109from object cimport Object
110from object_item cimport _object_item_to_python 109from object_item cimport _object_item_to_python
111from genlist cimport GenlistItemClass 110from genlist cimport GenlistItemClass
112 111
diff --git a/efl/elementary/theme.pyx b/efl/elementary/theme.pyx
index 4af5474..9745238 100644
--- a/efl/elementary/theme.pyx
+++ b/efl/elementary/theme.pyx
@@ -85,7 +85,7 @@ overlays. Don't use this unless you really know what you are doing.
85 85
86""" 86"""
87 87
88from cpython cimport PyUnicode_AsUTF8String, Py_INCREF, Py_DECREF 88from cpython cimport PyUnicode_AsUTF8String
89from libc.stdint cimport uintptr_t 89from libc.stdint cimport uintptr_t
90 90
91from efl.eo cimport PY_REFCOUNT 91from efl.eo cimport PY_REFCOUNT
diff --git a/efl/elementary/toolbar.pxd b/efl/elementary/toolbar.pxd
index 08075d4..5c50051 100644
--- a/efl/elementary/toolbar.pxd
+++ b/efl/elementary/toolbar.pxd
@@ -1,5 +1,5 @@
1from efl.evas cimport Eina_Bool, Evas_Object, Evas_Smart_Cb 1from efl.evas cimport Eina_Bool, Evas_Object, Evas_Smart_Cb
2from object_item cimport Elm_Object_Item, ObjectItem 2from object_item cimport Elm_Object_Item
3from enums cimport Elm_Object_Select_Mode, Elm_Toolbar_Shrink_Mode, \ 3from enums cimport Elm_Object_Select_Mode, Elm_Toolbar_Shrink_Mode, \
4 Elm_Icon_Lookup_Order, Elm_Toolbar_Item_Scrollto_Type 4 Elm_Icon_Lookup_Order, Elm_Toolbar_Item_Scrollto_Type
5 5
diff --git a/efl/elementary/toolbar.pyx b/efl/elementary/toolbar.pyx
index 14da5f5..a4539c3 100644
--- a/efl/elementary/toolbar.pyx
+++ b/efl/elementary/toolbar.pyx
@@ -169,11 +169,9 @@ from cpython cimport PyUnicode_AsUTF8String, Py_INCREF, Py_DECREF
169from efl.eo cimport _object_mapping_register, object_from_instance 169from efl.eo cimport _object_mapping_register, object_from_instance
170from efl.utils.conversions cimport _ctouni 170from efl.utils.conversions cimport _ctouni
171from efl.evas cimport Object as evasObject 171from efl.evas cimport Object as evasObject
172from object cimport Object
173from layout_class cimport LayoutClass 172from layout_class cimport LayoutClass
174from object_item cimport _object_item_callback, _object_item_to_python, \ 173from object_item cimport _object_item_callback, _object_item_to_python, \
175 _object_item_callback2 174 _object_item_callback2, ObjectItem
176from menu cimport Menu
177 175
178from efl.utils.deprecated cimport DEPRECATED 176from efl.utils.deprecated cimport DEPRECATED
179from scroller cimport elm_scroller_policy_get, elm_scroller_policy_set, \ 177from scroller cimport elm_scroller_policy_get, elm_scroller_policy_set, \
diff --git a/efl/elementary/transit.pyx b/efl/elementary/transit.pyx
index 2d77e58..5774c5a 100644
--- a/efl/elementary/transit.pyx
+++ b/efl/elementary/transit.pyx
@@ -144,10 +144,8 @@ Tween modes
144 144
145""" 145"""
146 146
147from cpython cimport PyUnicode_AsUTF8String, Py_INCREF, Py_DECREF 147from cpython cimport Py_INCREF, Py_DECREF
148 148
149from efl.eo cimport _object_mapping_register
150from efl.utils.conversions cimport _ctouni
151from efl.evas cimport Object as evasObject 149from efl.evas cimport Object as evasObject
152from efl.utils.conversions cimport eina_list_objects_to_python_list, \ 150from efl.utils.conversions cimport eina_list_objects_to_python_list, \
153 python_list_strings_to_eina_list 151 python_list_strings_to_eina_list
diff --git a/efl/elementary/window.pyx b/efl/elementary/window.pyx
index 0be3f35..f092d62 100644
--- a/efl/elementary/window.pyx
+++ b/efl/elementary/window.pyx
@@ -357,14 +357,12 @@ from efl.eo cimport _object_mapping_register, object_from_instance
357from efl.utils.conversions cimport _ctouni 357from efl.utils.conversions cimport _ctouni
358from efl.evas cimport Object as evasObject 358from efl.evas cimport Object as evasObject
359 359
360from libc.stdlib cimport malloc, free 360from libc.stdlib cimport free
361from libc.string cimport memcpy
362 361
363from object cimport Object 362from object cimport Object
364from efl.utils.conversions cimport python_list_strings_to_array_of_strings, \ 363from efl.utils.conversions cimport python_list_strings_to_array_of_strings, \
365 array_of_strings_to_python_list, python_list_ints_to_array_of_ints, \ 364 array_of_strings_to_python_list, python_list_ints_to_array_of_ints, \
366 array_of_ints_to_python_list 365 array_of_ints_to_python_list
367from efl.evas cimport Evas, evas_object_evas_get, Image as evasImage
368 366
369cimport enums 367cimport enums
370 368
diff --git a/efl/eo/efl.eo.pyx b/efl/eo/efl.eo.pyx
index 42817ab..6f8f27f 100644
--- a/efl/eo/efl.eo.pyx
+++ b/efl/eo/efl.eo.pyx
@@ -16,10 +16,9 @@
16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>. 16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>.
17 17
18from cpython cimport PyObject, Py_INCREF, Py_DECREF, PyUnicode_AsUTF8String 18from cpython cimport PyObject, Py_INCREF, Py_DECREF, PyUnicode_AsUTF8String
19from libc.stdlib cimport malloc, free 19
20from libc.string cimport memcpy, strdup
21from libc.stdint cimport uintptr_t 20from libc.stdint cimport uintptr_t
22from efl.eina cimport Eina_Bool, Eina_List, eina_list_append, \ 21from efl.eina cimport Eina_Bool, \
23 Eina_Hash, eina_hash_string_superfast_new, eina_hash_add, eina_hash_del, \ 22 Eina_Hash, eina_hash_string_superfast_new, eina_hash_add, eina_hash_del, \
24 eina_hash_find, EINA_LOG_DOM_DBG, EINA_LOG_DOM_INFO 23 eina_hash_find, EINA_LOG_DOM_DBG, EINA_LOG_DOM_INFO
25from efl.c_eo cimport Eo as cEo, eo_init, eo_shutdown, eo_del, eo_do, \ 24from efl.c_eo cimport Eo as cEo, eo_init, eo_shutdown, eo_del, eo_do, \
diff --git a/efl/evas/efl.evas.pyx b/efl/evas/efl.evas.pyx
index a2f0d3d..b58349d 100644
--- a/efl/evas/efl.evas.pyx
+++ b/efl/evas/efl.evas.pyx
@@ -15,12 +15,6 @@
15# You should have received a copy of the GNU Lesser General Public License 15# You should have received a copy of the GNU Lesser General Public License
16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>. 16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>.
17 17
18import traceback
19from cpython cimport PyUnicode_AsUTF8String
20from libc.stdint cimport uintptr_t
21#from efl.eina cimport *
22from efl.eo cimport Eo, object_from_instance, _object_mapping_register
23from efl.utils.conversions cimport _ctouni, _touni
24cimport efl.evas.enums as enums 18cimport efl.evas.enums as enums
25 19
26EVAS_LAYER_MIN = enums.EVAS_LAYER_MIN 20EVAS_LAYER_MIN = enums.EVAS_LAYER_MIN
diff --git a/efl/evas/efl.evas_canvas.pxi b/efl/evas/efl.evas_canvas.pxi
index cf7e8fa..22b60b4 100644
--- a/efl/evas/efl.evas_canvas.pxi
+++ b/efl/evas/efl.evas_canvas.pxi
@@ -15,6 +15,9 @@
15# You should have received a copy of the GNU Lesser General Public License 15# You should have received a copy of the GNU Lesser General Public License
16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>. 16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>.
17 17
18from libc.stdint cimport uintptr_t
19from cpython cimport PyUnicode_AsUTF8String
20from efl.eo cimport Eo, object_from_instance, _object_mapping_register
18 21
19# cdef int _canvas_free_wrapper_resources(Canvas canvas) except 0: 22# cdef int _canvas_free_wrapper_resources(Canvas canvas) except 0:
20# cdef int i 23# cdef int i
diff --git a/efl/evas/efl.evas_canvas_callbacks.pxi b/efl/evas/efl.evas_canvas_callbacks.pxi
index b217938..029a02c 100644
--- a/efl/evas/efl.evas_canvas_callbacks.pxi
+++ b/efl/evas/efl.evas_canvas_callbacks.pxi
@@ -15,6 +15,7 @@
15# You should have received a copy of the GNU Lesser General Public License 15# You should have received a copy of the GNU Lesser General Public License
16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>. 16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>.
17 17
18import traceback
18 19
19cdef int cb_canvas_dispatcher(Canvas self, event, int type) except 0: 20cdef int cb_canvas_dispatcher(Canvas self, event, int type) except 0:
20 # iterate over copy since users may delete callback from callback 21 # iterate over copy since users may delete callback from callback
diff --git a/efl/evas/efl.evas_object_events.pxi b/efl/evas/efl.evas_object_events.pxi
index 8f8ff29..dc47c3f 100644
--- a/efl/evas/efl.evas_object_events.pxi
+++ b/efl/evas/efl.evas_object_events.pxi
@@ -17,6 +17,8 @@
17 17
18from cpython cimport PyUnicode_AsUTF8String 18from cpython cimport PyUnicode_AsUTF8String
19 19
20from efl.utils.conversions cimport _ctouni
21
20cdef class EventPoint: 22cdef class EventPoint:
21 cdef void _set_obj(self, Evas_Point *obj): 23 cdef void _set_obj(self, Evas_Point *obj):
22 self.obj = obj 24 self.obj = obj
diff --git a/efl/evas/efl.evas_object_image.pxi b/efl/evas/efl.evas_object_image.pxi
index b5837cc..f53cb91 100644
--- a/efl/evas/efl.evas_object_image.pxi
+++ b/efl/evas/efl.evas_object_image.pxi
@@ -21,8 +21,6 @@ cdef extern from "Python.h":
21from cpython.buffer cimport Py_buffer, PyObject_CheckBuffer, \ 21from cpython.buffer cimport Py_buffer, PyObject_CheckBuffer, \
22 PyObject_GetBuffer, PyBuffer_Release, PyBUF_SIMPLE 22 PyObject_GetBuffer, PyBuffer_Release, PyBUF_SIMPLE
23 23
24from cpython.mem cimport PyMem_Malloc, PyMem_Realloc, PyMem_Free
25
26 24
27cdef int _data_size_get(Evas_Object *obj): 25cdef int _data_size_get(Evas_Object *obj):
28 cdef int stride, h, bpp, cspace, have_alpha 26 cdef int stride, h, bpp, cspace, have_alpha
diff --git a/efl/evas/efl.evas_object_textgrid.pxi b/efl/evas/efl.evas_object_textgrid.pxi
index 73f029d..60c1519 100644
--- a/efl/evas/efl.evas_object_textgrid.pxi
+++ b/efl/evas/efl.evas_object_textgrid.pxi
@@ -56,6 +56,8 @@
56 56
57""" 57"""
58 58
59from libc.stdlib cimport malloc
60
59EVAS_TEXTGRID_PALETTE_NONE = enums.EVAS_TEXTGRID_PALETTE_NONE 61EVAS_TEXTGRID_PALETTE_NONE = enums.EVAS_TEXTGRID_PALETTE_NONE
60EVAS_TEXTGRID_PALETTE_STANDARD = enums.EVAS_TEXTGRID_PALETTE_STANDARD 62EVAS_TEXTGRID_PALETTE_STANDARD = enums.EVAS_TEXTGRID_PALETTE_STANDARD
61EVAS_TEXTGRID_PALETTE_EXTENDED = enums.EVAS_TEXTGRID_PALETTE_EXTENDED 63EVAS_TEXTGRID_PALETTE_EXTENDED = enums.EVAS_TEXTGRID_PALETTE_EXTENDED
diff --git a/efl/evas/smart_object_metaclass.pxi b/efl/evas/smart_object_metaclass.pxi
index 31e5673..45635eb 100644
--- a/efl/evas/smart_object_metaclass.pxi
+++ b/efl/evas/smart_object_metaclass.pxi
@@ -66,7 +66,7 @@ class EvasSmartObjectMeta(type):
66 addr = _smart_object_class_new(cls.__name__) 66 addr = _smart_object_class_new(cls.__name__)
67 cls.__evas_smart_class__ = addr 67 cls.__evas_smart_class__ = addr
68 68
69from cpython cimport PyObject, PyTypeObject, Py_INCREF 69from cpython cimport PyObject, PyTypeObject
70 70
71cdef void _install_metaclass(meta, cls): 71cdef void _install_metaclass(meta, cls):
72 #Py_INCREF(meta) 72 #Py_INCREF(meta)
diff --git a/efl/utils/conversions.pyx b/efl/utils/conversions.pyx
index 173768b..f8251ee 100644
--- a/efl/utils/conversions.pyx
+++ b/efl/utils/conversions.pyx
@@ -15,7 +15,7 @@
15# You should have received a copy of the GNU Lesser General Public License 15# You should have received a copy of the GNU Lesser General Public License
16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>. 16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>.
17 17
18from libc.stdlib cimport malloc, free 18from libc.stdlib cimport malloc
19from libc.string cimport strdup 19from libc.string cimport strdup
20from cpython cimport PyUnicode_AsUTF8String 20from cpython cimport PyUnicode_AsUTF8String
21 21
diff --git a/include/efl.edje.pxd b/include/efl.edje.pxd
index ccb41ca..c79226b 100644
--- a/include/efl.edje.pxd
+++ b/include/efl.edje.pxd
@@ -15,9 +15,8 @@
15# You should have received a copy of the GNU Lesser General Public License 15# You should have received a copy of the GNU Lesser General Public License
16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>. 16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>.
17 17
18from efl.eina cimport * 18from efl.eina cimport Eina_Bool, Eina_List, Eina_Iterator
19from efl.evas cimport Object, Canvas, \ 19from efl.evas cimport Object, Evas_Object, Evas, Evas_Font_Size, Evas_Coord
20 Evas_Object, Evas, Evas_Font_Size, Evas_Coord
21 20
22 21
23cdef extern from "Edje.h": 22cdef extern from "Edje.h":
diff --git a/include/efl.edje_edit.pxd b/include/efl.edje_edit.pxd
index edee471..b9de61f 100644
--- a/include/efl.edje_edit.pxd
+++ b/include/efl.edje_edit.pxd
@@ -15,11 +15,11 @@
15# You should have received a copy of the GNU Lesser General Public License 15# You should have received a copy of the GNU Lesser General Public License
16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>. 16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>.
17 17
18from efl.eina cimport * 18from efl.eina cimport Eina_Bool, Eina_List
19from efl.evas cimport Canvas, Evas_Event_Flags 19from efl.evas cimport Evas_Event_Flags
20from efl.evas cimport Evas_Object, Evas 20from efl.evas cimport Evas_Object, Evas
21from efl.edje cimport Edje, Edje_Part_Type, Edje_Text_Effect, Edje_Tween_Mode, \ 21from efl.edje cimport Edje_Part_Type, Edje_Text_Effect, Edje_Tween_Mode, \
22 Edje_Action_Type 22 Edje_Action_Type
23 23
24 24
25cdef extern from "Edje_Edit.h": 25cdef extern from "Edje_Edit.h":
diff --git a/include/efl.eina.pxd b/include/efl.eina.pxd
index cc0e0b9..e0c7e0d 100644
--- a/include/efl.eina.pxd
+++ b/include/efl.eina.pxd
@@ -16,8 +16,6 @@
16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>. 16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>.
17 17
18from cpython cimport va_list 18from cpython cimport va_list
19from libc.stdlib cimport malloc, free
20from libc.string cimport memcpy, strdup
21 19
22cdef extern from "time.h": 20cdef extern from "time.h":
23 struct tm: 21 struct tm:
diff --git a/include/efl.eo.pxd b/include/efl.eo.pxd
index f9b31ba..b46f038 100644
--- a/include/efl.eo.pxd
+++ b/include/efl.eo.pxd
@@ -17,8 +17,6 @@
17 17
18from efl.c_eo cimport Eo as cEo 18from efl.c_eo cimport Eo as cEo
19 19
20from efl.eina cimport Eina_List
21
22cdef: 20cdef:
23 class Eo(object): 21 class Eo(object):
24 cdef: 22 cdef: