kuuko pushed a commit to branch master.

http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=d65101b24bfa8ab59b151d14af79b062d12ba0fa

commit d65101b24bfa8ab59b151d14af79b062d12ba0fa
Author: Kai Huuhko <kai.huu...@gmail.com>
Date:   Mon Apr 14 00:50:16 2014 +0300

    Code cleanup: Unused/misplaced cimports
---
 efl/edje/efl.edje.pyx                  | 1 +
 efl/edje/efl.edje_edit.pyx             | 7 ++++++-
 efl/edje/efl.edje_external.pxi         | 2 ++
 efl/elementary/actionslider.pyx        | 1 -
 efl/elementary/box.pxd                 | 1 -
 efl/elementary/box.pyx                 | 3 ---
 efl/elementary/bubble.pyx              | 3 ---
 efl/elementary/calendar_elm.pyx        | 4 ++--
 efl/elementary/check.pyx               | 1 -
 efl/elementary/clock.pyx               | 1 -
 efl/elementary/colorselector.pyx       | 2 +-
 efl/elementary/configuration.pxd       | 3 +--
 efl/elementary/ctxpopup.pyx            | 3 +--
 efl/elementary/dayselector.pyx         | 4 +---
 efl/elementary/diskselector.pxd        | 3 +--
 efl/elementary/diskselector.pyx        | 3 +--
 efl/elementary/entry.pxd               | 2 +-
 efl/elementary/entry.pyx               | 2 --
 efl/elementary/fileselector_button.pyx | 2 --
 efl/elementary/fileselector_entry.pyx  | 2 --
 efl/elementary/flipselector.pxd        | 4 ++--
 efl/elementary/flipselector.pyx        | 3 +--
 efl/elementary/frame.pyx               | 3 ---
 efl/elementary/general.pxd             | 7 +------
 efl/elementary/general.pyx             | 8 ++++----
 efl/elementary/gengrid.pxd             | 3 +--
 efl/elementary/genlist.pxd             | 3 +--
 efl/elementary/genlist.pyx             | 4 ++--
 efl/elementary/genlist_widget.pxi      | 2 ++
 efl/elementary/gesture_layer.pyx       | 3 +--
 efl/elementary/glview.pyx              | 1 -
 efl/elementary/hover.pyx               | 2 --
 efl/elementary/hoversel.pyx            | 2 +-
 efl/elementary/icon.pxd                | 3 +--
 efl/elementary/icon.pyx                | 1 +
 efl/elementary/index.pxd               | 3 +--
 efl/elementary/index.pyx               | 6 +++---
 efl/elementary/label.pyx               | 3 ---
 efl/elementary/layout.pxd              | 2 +-
 efl/elementary/layout.pyx              | 5 +----
 efl/elementary/list.pxd                | 4 ++--
 efl/elementary/list.pyx                | 5 ++---
 efl/elementary/menu.pxd                | 2 +-
 efl/elementary/menu.pyx                | 4 ++--
 efl/elementary/multibuttonentry.pxd    | 2 +-
 efl/elementary/multibuttonentry.pyx    | 5 ++---
 efl/elementary/naviframe.pxd           | 2 +-
 efl/elementary/naviframe.pyx           | 4 ++--
 efl/elementary/notify.pxd              | 1 -
 efl/elementary/notify.pyx              | 3 ---
 efl/elementary/object.pxd              | 1 -
 efl/elementary/object_item.pyx         | 4 +---
 efl/elementary/panel.pyx               | 1 -
 efl/elementary/photo.pyx               | 1 -
 efl/elementary/plug.pyx                | 3 ---
 efl/elementary/popup.pxd               | 2 +-
 efl/elementary/popup.pyx               | 6 ++----
 efl/elementary/progressbar.pyx         | 2 --
 efl/elementary/scroller.pyx            | 5 ++---
 efl/elementary/segment_control.pxd     | 2 +-
 efl/elementary/segment_control.pyx     | 2 +-
 efl/elementary/slideshow.pxd           | 2 +-
 efl/elementary/slideshow.pyx           | 5 +++--
 efl/elementary/store.pyx               | 1 -
 efl/elementary/theme.pyx               | 2 +-
 efl/elementary/toolbar.pxd             | 2 +-
 efl/elementary/toolbar.pyx             | 4 +---
 efl/elementary/transit.pyx             | 4 +---
 efl/elementary/window.pyx              | 4 +---
 efl/eo/efl.eo.pyx                      | 5 ++---
 efl/evas/efl.evas.pyx                  | 6 ------
 efl/evas/efl.evas_canvas.pxi           | 3 +++
 efl/evas/efl.evas_canvas_callbacks.pxi | 1 +
 efl/evas/efl.evas_object_events.pxi    | 2 ++
 efl/evas/efl.evas_object_image.pxi     | 2 --
 efl/evas/efl.evas_object_textgrid.pxi  | 2 ++
 efl/evas/smart_object_metaclass.pxi    | 2 +-
 efl/utils/conversions.pyx              | 2 +-
 include/efl.edje.pxd                   | 5 ++---
 include/efl.edje_edit.pxd              | 8 ++++----
 include/efl.eina.pxd                   | 2 --
 include/efl.eo.pxd                     | 2 --
 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
 cimport libc.stdlib
 from libc.stdint cimport uintptr_t
 
+from efl.eina cimport eina_list_free, eina_stringshare_del, Eina_Stringshare
 from efl.eo cimport _object_mapping_register, object_from_instance, \
     _register_decorated_callbacks
 
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 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this Python-EFL.  If not, see <http://www.gnu.org/licenses/>.
 
+from libc.stdlib cimport free
+
+from efl.eina cimport eina_stringshare_add, eina_stringshare_del, \
+    eina_stringshare_replace
 from efl.utils.conversions cimport _touni, _ctouni, \
     eina_list_strings_to_python_list
 from efl.eo cimport _register_decorated_callbacks
-from efl.edje cimport Edje_Part_Type
+from efl.evas cimport Canvas
+from efl.edje cimport Edje_Part_Type, Edje
 from efl.edje import EDJE_PART_TYPE_EXTERNAL
 
 
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 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this Python-EFL.  If not, see <http://www.gnu.org/licenses/>.
 
+from efl.eina cimport Eina_Hash_Tuple, eina_iterator_next, eina_iterator_free
+from efl.evas cimport Canvas
 
 cdef class ExternalParam:
     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
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String
 from libc.stdint cimport uintptr_t
 
 from 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 @@
 from efl.evas cimport Eina_Bool, Eina_List, Evas_Object, Evas_Coord
-from enums cimport Elm_Box_CLayout
 
 cdef extern from "Ecore.h":
     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
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String
-
 from efl.eo cimport _object_mapping_register
-from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
 from object cimport Object
 
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
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String
-
 from efl.eo cimport _object_mapping_register
-from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
 from layout_class cimport LayoutClass
 
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
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String, PyMem_Malloc, PyMem_Free
+from cpython cimport PyUnicode_AsUTF8String
 
-from efl.utils.conversions cimport _ctouni, array_of_strings_to_python_list, \
+from efl.utils.conversions cimport array_of_strings_to_python_list, \
     python_list_strings_to_array_of_strings
 from efl.eo cimport _object_mapping_register
 from 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:
 """
 
 from efl.eo cimport _object_mapping_register
-from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
 from layout_class cimport LayoutClass
 
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
 """
 
 from efl.eo cimport _object_mapping_register
-from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
 from layout_class cimport LayoutClass
 
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
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String, Py_DECREF
+from cpython cimport PyUnicode_AsUTF8String
 from libc.stdint cimport uintptr_t
 
 from 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 @@
-from efl.evas cimport Eina_Bool, Eina_List, Evas_Coord, Evas_Object, \
-    Evas_Font_Size
+from efl.evas cimport Eina_Bool, Eina_List, Evas_Coord, Evas_Font_Size
 from enums cimport Elm_Softcursor_Mode
 
 cdef 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
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String, Py_DECREF
+from cpython cimport PyUnicode_AsUTF8String
 
 from efl.eo cimport _object_mapping_register, object_from_instance
-from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
 from layout_class cimport LayoutClass
 from 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
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String
-
 from efl.eo cimport _object_mapping_register
 from efl.evas cimport Object as evasObject
 from efl.utils.conversions cimport python_list_strings_to_array_of_strings, \
-    eina_list_strings_to_python_list, _ctouni
+    eina_list_strings_to_python_list
 from layout_class cimport LayoutClass
 
 cimport 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 @@
 from efl.eina cimport Eina_List
 from efl.evas cimport Eina_Bool, Evas_Object, Evas_Smart_Cb
-from object_item cimport Elm_Object_Item, ObjectItem
-from enums cimport Elm_Scroller_Policy
+from object_item cimport Elm_Object_Item
 
 cdef extern from "Elementary.h":
     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::
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String, Py_DECREF
+from cpython cimport PyUnicode_AsUTF8String
 from libc.stdint cimport uintptr_t
 
 from efl.eo cimport _object_mapping_register
-from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
 from object cimport Object
 from 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 @@
 from efl.evas cimport Eina_Bool, Eina_Rectangle, Evas_Object, \
     Evas_Coord, Evas_Smart_Cb
 from enums cimport Elm_Wrap_Type, Elm_Text_Format, Elm_Cnp_Mode, \
-    Elm_Scroller_Policy, Elm_Input_Panel_Layout, Elm_Input_Panel_Lang, \
+    Elm_Input_Panel_Layout, Elm_Input_Panel_Lang, \
     Elm_Input_Panel_Lang, Elm_Input_Panel_Return_Key_Type, \
     Elm_Autocapital_Type, Elm_Icon_Type, Elm_Sel_Type, Elm_Sel_Format, \
     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
 from efl.eo cimport _object_mapping_register, object_from_instance
 from efl.utils.conversions cimport _touni, _ctouni
 from efl.evas cimport Object as evasObject
-from object cimport Object
 from layout_class cimport LayoutClass
-from hover cimport Hover
 
 from efl.utils.deprecated cimport DEPRECATED
 from 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, \
     elm_fileselector_folder_only_get, elm_fileselector_is_save_set, \
     elm_fileselector_is_save_get
 
-cimport enums
-
 def _cb_string_conv(uintptr_t addr):
     cdef const char *s = <const char *>addr
     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, \
     elm_fileselector_is_save_get, elm_fileselector_selected_set, \
     elm_fileselector_selected_get
 
-cimport enums
-
 def _cb_string_conv(uintptr_t addr):
     cdef const char *s = <const char *>addr
     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 @@
-from efl.evas cimport Eina_Bool, Evas_Object, Evas_Coord, Eina_List
+from efl.evas cimport Eina_Bool, Evas_Object, Eina_List
 from efl.evas cimport Evas_Smart_Cb
-from object_item cimport Elm_Object_Item, ObjectItem
+from object_item cimport Elm_Object_Item
 
 cdef extern from "Elementary.h":
     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
 from libc.stdint cimport uintptr_t
 
 from efl.eo cimport _object_mapping_register
-from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
 from object cimport Object
 from object_item cimport _object_item_to_python, _object_item_callback, \
-    _object_item_list_to_python, _object_item_callback2
+    _object_item_list_to_python, _object_item_callback2, ObjectItem
 
 def _cb_object_item_conv(uintptr_t addr):
     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:
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String
-
 from efl.eo cimport _object_mapping_register
-from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
 from layout_class cimport LayoutClass
 
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 @@
 #
 
 from efl.evas cimport Eina_List, Eina_Bool
-from efl.evas cimport Evas_Object, Evas_Smart_Cb, Evas_Font_Size, Evas_Coord
+from efl.evas cimport Evas_Object, Evas_Font_Size, Evas_Coord
 from efl.evas.enums cimport Evas_Callback_Type
-#from efl.evas cimport Evas_Load_Error
-#from efl.evas cimport Evas_Event_Flags
-from enums cimport Elm_Policy, Elm_Policy_Quit
-from libc.string cimport memcpy, strdup
-from libc.stdlib cimport free
 
 cdef extern from "time.h":
     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.
 
 """
 
-from cpython cimport PyObject, Py_INCREF, Py_DECREF, PyUnicode_AsUTF8String, \
-    PyMem_Malloc, PyMem_Free
-from libc.stdint cimport uintptr_t
+from cpython cimport PyUnicode_AsUTF8String, PyMem_Malloc, Py_DECREF
+from libc.string cimport memcpy
 
 from efl.evas cimport Object as evasObject
 
@@ -134,8 +133,9 @@ from efl.utils.logger cimport add_logger
 from efl.eina cimport EINA_LOG_DOM_DBG, EINA_LOG_DOM_INFO, \
     EINA_LOG_DOM_WARN, EINA_LOG_DOM_ERR, EINA_LOG_DOM_CRIT
 
+from enums cimport Elm_Policy
+
 import sys
-import traceback
 
 cimport enums
 
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, \
     Evas_Coord, Eina_Compare_Cb
 from object_item cimport Elm_Object_Item
 from general cimport Elm_Tooltip_Item_Content_Cb
-from enums cimport Elm_Genlist_Item_Scrollto_Type, Elm_Scroller_Policy, \
-    Elm_Object_Select_Mode
+from enums cimport Elm_Genlist_Item_Scrollto_Type, Elm_Object_Select_Mode
 
 cdef extern from "Elementary.h":
     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 @@
 from efl.evas cimport Eina_Bool, Eina_List, Eina_Compare_Cb, \
     Evas_Object, Evas_Smart_Cb, Evas_Coord
-from object cimport Object
 from object_item cimport Elm_Object_Item
 from general cimport Elm_Tooltip_Item_Content_Cb
-from enums cimport Elm_Scroller_Policy, Elm_List_Mode, Elm_Object_Select_Mode, 
\
+from enums cimport Elm_List_Mode, Elm_Object_Select_Mode, \
     Elm_Genlist_Item_Type, Elm_Genlist_Item_Scrollto_Type, \
     Elm_Genlist_Item_Field_Type
 
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"
 from cpython cimport PyUnicode_AsUTF8String, Py_DECREF, Py_INCREF
 from libc.stdint cimport uintptr_t
 
-from efl.eo cimport _object_mapping_register, PY_REFCOUNT
 from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
 
@@ -520,7 +519,8 @@ from scroller cimport elm_scroller_policy_get, 
elm_scroller_policy_set, \
 from object_item cimport ObjectItem, _object_item_to_python, \
     elm_object_item_widget_get, _object_item_from_python, \
     _object_item_list_to_python, elm_object_item_data_get
-from general cimport strdup
+from libc.string cimport strdup
+from object cimport Object
 
 from general cimport PY_EFL_ELM_LOG_DOMAIN
 from 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 @@
+from efl.eo cimport _object_mapping_register, PY_REFCOUNT
+
 #include "cnp_callbacks.pxi"
 
 cdef 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
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String, Py_INCREF
+from cpython cimport Py_INCREF
 
 from efl.eo cimport _object_mapping_register
-from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
 from object cimport Object
 
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.
 """
 
 from efl.eo cimport _object_mapping_register, object_from_instance
-from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
 from layout_class cimport LayoutClass
 
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
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String
-
 from efl.eo cimport _object_mapping_register, object_from_instance
 from efl.utils.conversions cimport _ctouni
 from 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
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String, Py_DECREF
+from cpython cimport PyUnicode_AsUTF8String
 from libc.stdint cimport uintptr_t
 
 from 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 @@
 from efl.evas cimport Eina_Bool, Evas_Object
-from image cimport Image
-from enums cimport Elm_Icon_Lookup_Order, Elm_Icon_Type
+from enums cimport Elm_Icon_Lookup_Order
 
 cdef extern from "Elementary.h":
     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
 from efl.eo cimport _object_mapping_register
 from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
+from image cimport Image
 
 cimport enums
 
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 @@
 from efl.evas cimport Eina_Bool, Eina_Compare_Cb, Evas_Object, Evas_Smart_Cb
-from object cimport Object
-from object_item cimport Elm_Object_Item, ObjectItem
+from object_item cimport Elm_Object_Item
 
 cdef extern from "Elementary.h":
     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.
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String, Py_DECREF
+from cpython cimport PyUnicode_AsUTF8String
 from libc.stdint cimport uintptr_t
 
 from efl.eo cimport _object_mapping_register
@@ -73,8 +73,8 @@ from efl.utils.conversions cimport _ctouni
 from efl.utils.deprecated cimport DEPRECATED
 from efl.evas cimport Object as evasObject
 from layout_class cimport LayoutClass
-from object_item cimport _object_item_callback, _object_item_to_python, \
-    elm_object_item_data_get, _object_item_callback2
+from object_item cimport _object_item_to_python, elm_object_item_data_get, \
+    _object_item_callback2, ObjectItem
 
 import traceback
 
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
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String
-
 from efl.eo cimport _object_mapping_register
-from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
 from layout_class cimport LayoutClass
 from 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 @@
-from efl.evas cimport Evas_Object, Eina_Bool
+from efl.evas cimport Evas_Object
 
 cdef extern from "Elementary.h":
     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:
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String
-
-from efl.eo cimport _object_mapping_register, object_from_instance
-from efl.utils.conversions cimport _ctouni
+from efl.eo cimport _object_mapping_register
 from efl.evas cimport Object as evasObject
 from layout_class cimport LayoutClass
 
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 @@
 from efl.evas cimport Eina_Bool, Eina_List, Eina_Compare_Cb, \
     Evas_Object, Evas_Smart_Cb, Evas_Coord
-from object_item cimport Elm_Object_Item, ObjectItem
-from enums cimport Elm_List_Mode, Elm_Object_Select_Mode, Elm_Scroller_Policy
+from object_item cimport Elm_Object_Item
+from enums cimport Elm_List_Mode, Elm_Object_Select_Mode
 
 cdef extern from "Elementary.h":
     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
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String, Py_DECREF
+from cpython cimport PyUnicode_AsUTF8String
 from libc.stdint cimport uintptr_t
 
 from efl.eo cimport _object_mapping_register, object_from_instance, PY_REFCOUNT
-from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
 from object cimport Object
 from object_item cimport _object_item_callback, _object_item_callback2, \
-    _object_item_to_python, _object_item_list_to_python
+    _object_item_to_python, _object_item_list_to_python, ObjectItem
 
 from efl.utils.deprecated cimport DEPRECATED
 from 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 @@
 from efl.evas cimport Eina_Bool, Eina_List, Evas_Object, Evas_Coord, \
     Evas_Smart_Cb
 from object cimport Object
-from object_item cimport Elm_Object_Item, ObjectItem
+from object_item cimport Elm_Object_Item
 
 cdef extern from "Elementary.h":
     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:
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String, Py_DECREF
+from cpython cimport PyUnicode_AsUTF8String
 
 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_item cimport _object_item_callback, _object_item_list_to_python, \
-    _object_item_to_python, _object_item_callback2
+    _object_item_to_python, _object_item_callback2, ObjectItem
 
 cdef class MenuItem(ObjectItem):
 
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 @@
 from efl.evas cimport Eina_Bool, Eina_List, Evas_Object, Evas_Smart_Cb
-from object_item cimport Elm_Object_Item, ObjectItem
+from object_item cimport Elm_Object_Item
 
 cdef extern from "Elementary.h":
 
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:
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String, Py_DECREF, Py_INCREF
+from cpython cimport PyUnicode_AsUTF8String, Py_INCREF
 from libc.stdint cimport uintptr_t
 
 from efl.eo cimport _object_mapping_register, object_from_instance, PY_REFCOUNT
 from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
 
-from libc.stdlib cimport free
 from libc.string cimport strdup
 from object cimport Object
 import traceback
 from object_item cimport _object_item_callback, _object_item_callback2, \
-    _object_item_to_python, _object_item_list_to_python
+    _object_item_to_python, _object_item_list_to_python, ObjectItem
 
 cdef Eina_Bool _multibuttonentry_filter_callback(Evas_Object *obj, \
     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 @@
 from efl.evas cimport Evas_Object, Eina_Bool, Eina_List
-from object_item cimport Elm_Object_Item, ObjectItem
+from object_item cimport Elm_Object_Item
 
 cdef extern from "Elementary.h":
     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
 from efl.evas cimport Object as evasObject
 from layout_class cimport LayoutClass
 
-from object_item cimport    _object_item_to_python, \
-                            _object_item_list_to_python
+from object_item cimport _object_item_to_python, _object_item_list_to_python, \
+    ObjectItem
 
 from efl.utils.deprecated cimport DEPRECATED
 
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 @@
 from efl.evas cimport Eina_Bool, Evas_Object
-from enums cimport Elm_Notify_Orient
 
 cdef extern from "Elementary.h":
     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
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String
-
 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
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 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this Python-EFL.  If not, see <http://www.gnu.org/licenses/>.
 
-from cpython cimport PyObject, Py_INCREF, Py_DECREF
 from efl.evas cimport Eina_Bool, Eina_List, \
     Evas_Object, Evas_Smart_Cb, Evas_Coord
 from 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 @@
 from cpython cimport PyUnicode_AsUTF8String, Py_DECREF, Py_INCREF
 from libc.stdint cimport uintptr_t
 
-from efl.eo cimport _object_mapping_register, object_from_instance, PY_REFCOUNT
+from efl.eo cimport PY_REFCOUNT
 from efl.utils.conversions cimport _ctouni
 from efl.utils.deprecated cimport DEPRECATED
 from efl.evas cimport Object as evasObject
@@ -32,8 +32,6 @@ include "tooltips.pxi"
 # cdef void _tooltip_item_data_del_cb(void *data, Evas_Object *o, void 
*event_info) with gil:
 #    Py_DECREF(<object>data)
 
-from efl.utils.conversions cimport python_list_objects_to_eina_list, \
-    eina_list_objects_to_python_list
 from object cimport Object
 import traceback
 
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
 
 from efl.eo cimport _object_mapping_register
 from efl.evas cimport Object as evasObject
-from object cimport Object
 from layout_class cimport LayoutClass
 
 cimport 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:
 from cpython cimport PyUnicode_AsUTF8String
 
 from efl.eo cimport _object_mapping_register
-from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
 from object cimport Object
 
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:
 from cpython cimport PyUnicode_AsUTF8String
 
 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.evas cimport Image as evasImage
-
 cdef class Plug(Object):
 
     """
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 @@
 from efl.evas cimport Eina_Bool, Evas_Object, Evas_Smart_Cb
-from object_item cimport Elm_Object_Item, ObjectItem
+from object_item cimport Elm_Object_Item
 from enums cimport Elm_Wrap_Type, Elm_Popup_Orient
 
 cdef 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
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String, Py_DECREF
+from cpython cimport PyUnicode_AsUTF8String
 from libc.stdint cimport uintptr_t
 
 from efl.eo cimport _object_mapping_register, PY_REFCOUNT
-from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
-from object cimport Object
 from layout_class cimport LayoutClass
 from object_item cimport _object_item_callback, _object_item_callback2, \
-    _object_item_to_python
+    ObjectItem
 
 cimport enums
 
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
 from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
 from layout_class cimport LayoutClass
-from object cimport Object
-
 
 cdef class Progressbar(LayoutClass):
 
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.
 
 from cpython cimport PyUnicode_AsUTF8String
 
-from efl.evas cimport Evas_Object, Object as evasObject
-from efl.eo cimport object_from_instance, _object_mapping_register
-from efl.utils.conversions cimport _ctouni, _touni
+from efl.evas cimport Object as evasObject
+from efl.eo cimport _object_mapping_register
 
 from object cimport Object
 from 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 @@
 from efl.evas cimport Eina_Bool, Evas_Object
-from object_item cimport Elm_Object_Item, ObjectItem
+from object_item cimport Elm_Object_Item
 
 cdef extern from "Elementary.h":
     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
 from efl.evas cimport Object as evasObject
 from layout_class cimport LayoutClass
 
-from object_item cimport _object_item_to_python
+from object_item cimport _object_item_to_python, ObjectItem
 
 def _cb_object_item_conv(uintptr_t addr):
     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 @@
 from efl.evas cimport Eina_Bool, Eina_Compare_Cb, Eina_List, Evas_Object
-from object_item cimport Elm_Object_Item, ObjectItem
+from object_item cimport Elm_Object_Item
 
 cdef extern from "Elementary.h":
 
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
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String, Py_INCREF, Py_DECREF
+from cpython cimport PyUnicode_AsUTF8String, Py_INCREF
 from libc.stdint cimport uintptr_t
 
 from 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
 from layout_class cimport LayoutClass
 
 import traceback
-from object_item cimport _object_item_to_python, _object_item_list_to_python
+from object_item cimport _object_item_to_python, _object_item_list_to_python, \
+    ObjectItem
 
 def _cb_object_item_conv(uintptr_t addr):
     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
 from libc.string cimport strdup
 from cpython cimport Py_INCREF, Py_DECREF
 from efl.eo cimport _ctouni, _touni
-from object cimport Object
 from object_item cimport _object_item_to_python
 from genlist cimport GenlistItemClass
 
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.
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String, Py_INCREF, Py_DECREF
+from cpython cimport PyUnicode_AsUTF8String
 from libc.stdint cimport uintptr_t
 
 from 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 @@
 from efl.evas cimport Eina_Bool, Evas_Object, Evas_Smart_Cb
-from object_item cimport Elm_Object_Item, ObjectItem
+from object_item cimport Elm_Object_Item
 from enums cimport Elm_Object_Select_Mode, Elm_Toolbar_Shrink_Mode, \
     Elm_Icon_Lookup_Order, Elm_Toolbar_Item_Scrollto_Type
 
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
 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 layout_class cimport LayoutClass
 from object_item cimport _object_item_callback, _object_item_to_python, \
-    _object_item_callback2
-from menu cimport Menu
+    _object_item_callback2, ObjectItem
 
 from efl.utils.deprecated cimport DEPRECATED
 from 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
 
 """
 
-from cpython cimport PyUnicode_AsUTF8String, Py_INCREF, Py_DECREF
+from cpython cimport Py_INCREF, Py_DECREF
 
-from efl.eo cimport _object_mapping_register
-from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
 from efl.utils.conversions cimport eina_list_objects_to_python_list, \
     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
 from efl.utils.conversions cimport _ctouni
 from efl.evas cimport Object as evasObject
 
-from libc.stdlib cimport malloc, free
-from libc.string cimport memcpy
+from libc.stdlib cimport free
 
 from object cimport Object
 from efl.utils.conversions cimport python_list_strings_to_array_of_strings, \
     array_of_strings_to_python_list, python_list_ints_to_array_of_ints, \
     array_of_ints_to_python_list
-from efl.evas cimport Evas, evas_object_evas_get, Image as evasImage
 
 cimport enums
 
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 @@
 # along with this Python-EFL.  If not, see <http://www.gnu.org/licenses/>.
 
 from cpython cimport PyObject, Py_INCREF, Py_DECREF, PyUnicode_AsUTF8String
-from libc.stdlib cimport malloc, free
-from libc.string cimport memcpy, strdup
+
 from libc.stdint cimport uintptr_t
-from efl.eina cimport Eina_Bool, Eina_List, eina_list_append, \
+from efl.eina cimport Eina_Bool, \
     Eina_Hash, eina_hash_string_superfast_new, eina_hash_add, eina_hash_del, \
     eina_hash_find, EINA_LOG_DOM_DBG, EINA_LOG_DOM_INFO
 from 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 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this Python-EFL.  If not, see <http://www.gnu.org/licenses/>.
 
-import traceback
-from cpython cimport PyUnicode_AsUTF8String
-from libc.stdint cimport uintptr_t
-#from efl.eina cimport *
-from efl.eo cimport Eo, object_from_instance, _object_mapping_register
-from efl.utils.conversions cimport _ctouni, _touni
 cimport efl.evas.enums as enums
 
 EVAS_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 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this Python-EFL.  If not, see <http://www.gnu.org/licenses/>.
 
+from libc.stdint cimport uintptr_t
+from cpython cimport PyUnicode_AsUTF8String
+from efl.eo cimport Eo, object_from_instance, _object_mapping_register
 
 # cdef int _canvas_free_wrapper_resources(Canvas canvas) except 0:
 #     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 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this Python-EFL.  If not, see <http://www.gnu.org/licenses/>.
 
+import traceback
 
 cdef int cb_canvas_dispatcher(Canvas self, event, int type) except 0:
     # 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 @@
 
 from cpython cimport PyUnicode_AsUTF8String
 
+from efl.utils.conversions cimport _ctouni
+
 cdef class EventPoint:
     cdef void _set_obj(self, Evas_Point *obj):
         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":
 from cpython.buffer cimport Py_buffer, PyObject_CheckBuffer, \
     PyObject_GetBuffer, PyBuffer_Release, PyBUF_SIMPLE
 
-from cpython.mem cimport PyMem_Malloc, PyMem_Realloc, PyMem_Free
-
 
 cdef int _data_size_get(Evas_Object *obj):
     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 @@
 
 """
 
+from libc.stdlib cimport malloc
+
 EVAS_TEXTGRID_PALETTE_NONE = enums.EVAS_TEXTGRID_PALETTE_NONE
 EVAS_TEXTGRID_PALETTE_STANDARD = enums.EVAS_TEXTGRID_PALETTE_STANDARD
 EVAS_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):
         addr = _smart_object_class_new(cls.__name__)
         cls.__evas_smart_class__ = addr
 
-from cpython cimport PyObject, PyTypeObject, Py_INCREF
+from cpython cimport PyObject, PyTypeObject
 
 cdef void _install_metaclass(meta, cls):
     #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 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this Python-EFL.  If not, see <http://www.gnu.org/licenses/>.
 
-from libc.stdlib cimport malloc, free
+from libc.stdlib cimport malloc
 from libc.string cimport strdup
 from cpython cimport PyUnicode_AsUTF8String
 
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 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this Python-EFL.  If not, see <http://www.gnu.org/licenses/>.
 
-from efl.eina cimport *
-from efl.evas cimport Object, Canvas, \
-    Evas_Object, Evas, Evas_Font_Size, Evas_Coord
+from efl.eina cimport Eina_Bool, Eina_List, Eina_Iterator
+from efl.evas cimport Object, Evas_Object, Evas, Evas_Font_Size, Evas_Coord
 
 
 cdef 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 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this Python-EFL.  If not, see <http://www.gnu.org/licenses/>.
 
-from efl.eina cimport *
-from efl.evas cimport Canvas, Evas_Event_Flags
+from efl.eina cimport Eina_Bool, Eina_List
+from efl.evas cimport Evas_Event_Flags
 from efl.evas cimport Evas_Object, Evas
-from efl.edje cimport Edje, Edje_Part_Type, Edje_Text_Effect, Edje_Tween_Mode, 
\
-                      Edje_Action_Type
+from efl.edje cimport Edje_Part_Type, Edje_Text_Effect, Edje_Tween_Mode, \
+    Edje_Action_Type
 
 
 cdef 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 @@
 # along with this Python-EFL.  If not, see <http://www.gnu.org/licenses/>.
 
 from cpython cimport va_list
-from libc.stdlib cimport malloc, free
-from libc.string cimport memcpy, strdup
 
 cdef extern from "time.h":
     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 @@
 
 from efl.c_eo cimport Eo as cEo
 
-from efl.eina cimport Eina_List
-
 cdef:
     class Eo(object):
         cdef:

-- 


Reply via email to