Silence warnings in Cython 0.20

efl/edje/efl.edje.pyx

@@ -260,7 +260,9 @@ def color_class_del(color_class):
 
 
 def color_class_list():
-    cdef Eina_List *lst, *itr
+    cdef:
+        Eina_List *lst
+        Eina_List *itr
     ret = []
     lst = edje_color_class_list()
     itr = lst
@@ -290,7 +292,9 @@ def text_class_del(text_class):
 
 
 def text_class_list():
-    cdef Eina_List *lst, *itr
+    cdef:
+        Eina_List *lst
+        Eina_List *itr
     ret = []
     lst = edje_text_class_list()
     itr = lst

efl/edje/efl.edje_edit_part_state.pxi

@@ -64,7 +64,10 @@ cdef class State:
                                          self.value))
     """
     def rel1_to_get(self):
-        cdef const_char  *tx, *ty
+        cdef:
+            const_char *tx
+            const_char *ty
+
         tx = edje_edit_state_rel1_to_x_get(self.edje.obj, self.part, self.name,
                                            self.value)
         ty = edje_edit_state_rel1_to_y_get(self.edje.obj, self.part, self.name,

efl/edje/efl.edje_object.pxi

@@ -213,7 +213,9 @@ cdef class Edje(Object):
         :rtype: tuple of str
 
         """
-        cdef const_char *file, *group
+        cdef:
+            const_char *file
+            const_char *group
         edje_object_file_get(self.obj, &file, &group)
         return (_ctouni(file), _ctouni(group))
 

efl/elementary/background.pyx

@@ -115,7 +115,10 @@ cdef class Background(LayoutClass):
 
         """
         def __get__(self):
-            cdef const_char *filename, *group
+            cdef:
+                const_char *filename
+                const_char *group
+
             elm_bg_file_get(self.obj, &filename, &group)
             return (_ctouni(filename), _ctouni(group))
 
@@ -141,7 +144,10 @@ cdef class Background(LayoutClass):
             <const_char *>group if group is not None else NULL):
                 raise RuntimeError("Could not set background file.")
     def file_get(self):
-        cdef const_char *filename, *group
+        cdef:
+            const_char *filename
+            const_char *group
+
         elm_bg_file_get(self.obj, &filename, &group)
         return (_ctouni(filename), _ctouni(group))
 

efl/elementary/configuration.pyx

@@ -590,9 +590,12 @@ cdef class Configuration(object):
 
         """
         def __get__(self):
-            cdef Eina_List *lst
-            cdef Elm_Text_Class *data
-            cdef const_char *name, *desc
+            cdef:
+                Eina_List *lst
+                Elm_Text_Class *data
+                const_char *name
+                const_char *desc
+
             ret = []
             lst = elm_config_text_classes_list_get()
             while lst:
@@ -617,10 +620,13 @@ cdef class Configuration(object):
 
         """
         def __get__(self):
-            cdef const_Eina_List *lst
-            cdef Elm_Font_Overlay *data
-            cdef const_char *text_class, *font
-            cdef Evas_Font_Size size
+            cdef:
+                const_Eina_List *lst
+                Elm_Font_Overlay *data
+                const_char *text_class
+                const_char *font
+                Evas_Font_Size size
+
             ret = []
             lst = elm_config_font_overlay_list_get()
             while lst:

efl/elementary/entry.pyx

@@ -604,7 +604,8 @@ cdef class EntryContextMenuItem(object):
         """
         def __get__(self):
             cdef:
-                const_char *icon_file, *icon_group
+                const_char *icon_file
+                const_char *icon_group
                 Elm_Icon_Type icon_type
             elm_entry_context_menu_item_icon_get(self.item,
                 &icon_file,

efl/elementary/general.pyx

@@ -195,8 +195,10 @@ def init():
 
     # FIXME: Why are we passing the cl args to elm_init here?
 
-    cdef int argc, i, arg_len
-    cdef char **argv, *arg
+    cdef:
+        int argc, i, arg_len
+        char **argv
+        char *arg
 
     argc = len(sys.argv)
     argv = <char **>PyMem_Malloc(argc * sizeof(char *))

efl/elementary/genlist_item.pxi

@@ -161,7 +161,8 @@ cdef class GenlistItem(ObjectItem):
 
         """
         cdef:
-            Elm_Object_Item *item, *before
+            Elm_Object_Item *item
+            Elm_Object_Item *before
             Genlist genlist = before_item.widget
             Evas_Smart_Cb cb = NULL
 
@@ -195,7 +196,8 @@ cdef class GenlistItem(ObjectItem):
 
         """
         cdef:
-            Elm_Object_Item *item, *after
+            Elm_Object_Item *item
+            Elm_Object_Item *after
             Genlist genlist = after_item.widget
             Evas_Smart_Cb cb = NULL
 

efl/elementary/hoversel.pyx

@@ -193,8 +193,11 @@ cdef class HoverselItem(ObjectItem):
                     a3)
 
         def __get__(self):
-            cdef const_char *icon_file, *icon_group
-            cdef Elm_Icon_Type icon_type
+            cdef:
+                const_char *icon_file
+                const_char *icon_group
+                Elm_Icon_Type icon_type
+
             if self.item == NULL:
                 a1 = self.icon_file.decode("UTF-8")
                 a2 = self.icon_group.decode("UTF-8")
@@ -218,8 +221,11 @@ cdef class HoverselItem(ObjectItem):
                 <const_char *>a2 if a2 is not None else NULL,
                 a3)
     def icon_get(self):
-        cdef const_char *icon_file, *icon_group
-        cdef Elm_Icon_Type icon_type
+        cdef:
+            const_char *icon_file
+            const_char *icon_group
+            Elm_Icon_Type icon_type
+
         if self.item == NULL:
             a1 = self.icon_file.decode("UTF-8")
             a2 = self.icon_group.decode("UTF-8")

efl/elementary/image.pyx

@@ -206,7 +206,10 @@ cdef class Image(Object):
                     raise RuntimeError("Could not set file.")
 
         def __get__(self):
-            cdef const_char *filename, *group
+            cdef:
+                const_char *filename
+                const_char *group
+
             elm_image_file_get(self.obj, &filename, &group)
             return (_ctouni(filename), _ctouni(group))
 
@@ -218,7 +221,10 @@ cdef class Image(Object):
             <const_char *>group if group is not None else NULL):
                 raise RuntimeError("Could not set file.")
     def file_get(self):
-        cdef const_char *filename, *group
+        cdef:
+            const_char *filename
+            const_char *group
+
         elm_image_file_get(self.obj, &filename, &group)
         return (_ctouni(filename), _ctouni(group))
 

efl/elementary/list.pyx

@@ -198,7 +198,8 @@ cdef class ListItem(ObjectItem):
     """An item for the list widget."""
     cdef:
         object label
-        Evas_Object *icon_obj, *end_obj
+        Evas_Object *icon_obj
+        Evas_Object *end_obj
 
     def __init__(self, label = None, evasObject icon = None,
         evasObject end = None, callback = None, cb_data = None, *args, **kargs):

efl/elementary/menu.pyx

@@ -79,8 +79,10 @@ cdef class MenuItem(ObjectItem):
 
     def add_to(self, Menu menu not None):
         # TODO: document this
-        cdef Elm_Object_Item *item, *parent_obj = NULL
-        cdef Evas_Smart_Cb cb = NULL
+        cdef:
+            Elm_Object_Item *item
+            Elm_Object_Item *parent_obj = NULL
+            Evas_Smart_Cb cb = NULL
 
         if self.cb_func is not None:
             cb = _object_item_callback2

efl/elementary/naviframe.pyx

@@ -109,8 +109,11 @@ cdef class NaviframeItem(ObjectItem):
 
     """An item for the Naviframe widget."""
 
-    cdef object label, item_style
-    cdef Evas_Object *prev_btn, *next_btn, *item_content
+    cdef:
+        object label, item_style
+        Evas_Object *prev_btn
+        Evas_Object *next_btn
+        Evas_Object *item_content
 
     def __cinit__(self):
         self.prev_btn = NULL

efl/elementary/thumb.pyx

@@ -236,7 +236,10 @@ cdef class Thumb(Object):
                 <const_char *>file_name if file_name is not None else NULL,
                 <const_char *>key if key is not None else NULL)
         def __get__(self):
-            cdef const_char *file_name, *key
+            cdef:
+                const_char *file_name
+                const_char *key
+
             elm_thumb_file_get(self.obj, &file_name, &key)
             return(_ctouni(file_name), _ctouni(key))
 
@@ -255,7 +258,10 @@ cdef class Thumb(Object):
 
         """
         def __get__(self):
-            cdef const_char *path, *key
+            cdef:
+                const_char *path
+                const_char *key
+
             elm_thumb_path_get(self.obj, &path, &key)
             return(_ctouni(path), _ctouni(key))
 

efl/emotion/efl.emotion.pyx

@@ -141,9 +141,12 @@ def webcams_get():
     .. versionadded:: 1.8
 
     """
-    cdef const_Eina_List *lst, *itr
-    cdef Emotion_Webcam *cam
-    cdef const_char *name, *device
+    cdef:
+        const_Eina_List *lst
+        const_Eina_List *itr
+        Emotion_Webcam *cam
+        const_char *name
+        const_char *device
 
     ret = []
     lst = emotion_webcams_get()

efl/evas/efl.evas_canvas.pxi

@@ -389,9 +389,12 @@ cdef class Canvas(Eo):
         :return: children objects.
         :rtype: List of :py:class:`efl.evas.Object`
         """
-        cdef Eina_List *objs, *itr
-        cdef int ip, ih
-        cdef Evas_Object *o
+        cdef:
+            Eina_List *objs
+            Eina_List *itr
+            int ip, ih
+            Evas_Object *o
+
         ip = include_pass_events_objects
         ih = include_hidden_objects
         objs = evas_objects_at_xy_get(self.obj, x, y, ip, ih)
@@ -419,9 +422,12 @@ cdef class Canvas(Eo):
         :return: children objects.
         :rtype: List of :py:class:`efl.evas.Object`
         """
-        cdef Eina_List *objs, *itr
-        cdef int ip, ih
-        cdef Evas_Object *o
+        cdef:
+            Eina_List *objs
+            Eina_List *itr
+            int ip, ih
+            Evas_Object *o
+
         ip = include_pass_events_objects
         ih = include_hidden_objects
         objs = evas_objects_in_rectangle_get(self.obj, x, y, w, h, ip, ih)
@@ -554,8 +560,11 @@ cdef class Canvas(Eo):
     def font_available_list(self):
         """:rtype: list of str"""
         # TODO: use list conv func
-        cdef void *p
-        cdef Eina_List *itr, *head
+        cdef:
+            void *p
+            Eina_List *itr
+            Eina_List *head
+
         lst = []
         p = <void*>evas_font_available_list(self.obj) # avoid warning
         head = <Eina_List*>p

efl/evas/efl.evas_object_image.pxi

@@ -192,7 +192,10 @@ cdef class Image(Object):
 
         """
         def __get__(self):
-            cdef const_char *file, *key
+            cdef:
+                const_char *file
+                const_char *key
+
             evas_object_image_file_get(self.obj, &file, &key)
             return (_ctouni(file), _ctouni(key))
 
@@ -223,7 +226,10 @@ cdef class Image(Object):
             raise EvasLoadError(err, filename, key)
 
     def file_get(self):
-        cdef const_char *file, *key
+        cdef:
+            const_char *file
+            const_char *key
+
         evas_object_image_file_get(self.obj, &file, &key)
         return (_ctouni(file), _ctouni(key))
 

efl/evas/efl.evas_object_smart.pxi

@@ -537,7 +537,10 @@ cdef class SmartObject(Object):
         Default implementation to delete all children.
 
         """
-        cdef Eina_List *lst, *itr
+        cdef:
+            Eina_List *lst
+            Eina_List *itr
+
         lst = evas_object_smart_members_get(self.obj)
         itr = lst
         while itr:

examples/elementary/test_genlist.py

@@ -4,7 +4,7 @@
 import time
 import sys
 import os
-if sys.version_info < (3,): range = xrange
+#if sys.version_info < (3,): range = xrange
 
 from efl import evas
 from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, \

include/efl.edje.pxd

@@ -111,14 +111,18 @@ cdef extern from "Edje.h":
         double default "def", min, max, step
 
     ctypedef struct aux_external_param_info_string:
-        char *default "def", *accept_fmt, *deny_fmt
+        char *default "def"
+        char *accept_fmt
+        char *deny_fmt
 
     ctypedef struct aux_external_param_info_bool:
         unsigned int default "def"
-        char *false_str, *true_str
+        char *false_str
+        char *true_str
 
     ctypedef struct aux_external_param_info_choice:
-        char *default "def", **choices
+        char *default "def"
+        char **choices
 
     ctypedef union aux_external_param_info:
         aux_external_param_info_int i