Enlightenment

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas/include




Log Message:
Directory /cvs/e/e17/proto/python-efl/python-evas/include added to the repository

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas/include/evas




Log Message:
Directory /cvs/e/e17/proto/python-efl/python-evas/include/evas added to the repository

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas/include


Added Files:
	python.pxd 


Log Message:
Organized and changed code to use Cython instead of Pyrex.

 - moved headers (.pxd and .h) to include directory
 - changed README and setup.py to use Cython

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas/evas


Removed Files:
	evas.c_evas.pxd python.pxd python_evas_utils.h 


Log Message:
Organized and changed code to use Cython instead of Pyrex.

 - moved headers (.pxd and .h) to include directory
 - changed README and setup.py to use Cython

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas/include/evas


Added Files:
	c_evas.pxd python_evas_utils.h 


Log Message:
Organized and changed code to use Cython instead of Pyrex.

 - moved headers (.pxd and .h) to include directory
 - changed README and setup.py to use Cython

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas


Modified Files:
	README setup.py 


Log Message:
Organized and changed code to use Cython instead of Pyrex.

 - moved headers (.pxd and .h) to include directory
 - changed README and setup.py to use Cython

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- README	24 Jul 2007 14:42:04 -0000	1.3
+++ README	30 Sep 2007 21:57:17 -0000	1.4
@@ -4,7 +4,7 @@
 ============
 
  * Evas >= 0.9.9.040
- * Pyrex >= 0.9.5
+ * Cython from Mercurial repository (http://www.cython.org/hg/)
  * Python >= 2.4
  * Python-setuptools >= 0.6_rc3
 
@@ -24,10 +24,10 @@
         python setup.py install_headers
 
 The last step, "install_headers", is required to enable build of other
-modules that depends on this, like python-edje and python-emotion.
+modules that depend on this, like python-ecore, python-edje and python-emotion.
 
 You can choose where to install by using command options, see output
-of "python setup.py $COMMAND --help", example:
+of "python setup.py <command> --help", example:
 
         python setup.py install --help
         python setup.py install_headers --help
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/setup.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- setup.py	4 Sep 2007 18:50:39 -0000	1.15
+++ setup.py	30 Sep 2007 21:57:17 -0000	1.16
@@ -5,8 +5,12 @@
 use_setuptools('0.6c3')
 
 from setuptools import setup, find_packages, Extension
+from distutils.command.install_headers import install_headers
+from distutils.sysconfig import get_python_inc
 import commands
 
+from Cython.Distutils import build_ext
+
 
 def pkgconfig(*packages, **kw):
     flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'}
@@ -25,8 +29,7 @@
 evasmodule = Extension('evas.c_evas',
                        sources=['evas/evas.c_evas.pyx',
                                 ],
-                       depends=['evas/evas.c_evas.pxd',
-                                'evas/evas.c_evas_canvas.pxi',
+                       depends=['evas/evas.c_evas_canvas.pxi',
                                 'evas/evas.c_evas_object.pxi',
                                 'evas/evas.c_evas_object_smart.pxi',
                                 'evas/evas.c_evas_object_rectangle.pxi',
@@ -35,15 +38,20 @@
                                 'evas/evas.c_evas_object_gradient.pxi',
                                 'evas/evas.c_evas_object_polygon.pxi',
                                 'evas/evas.c_evas_object_text.pxi',
-                                'evas/python.pxd',
+                                'include/evas/c_evas.pxd',
+                                'include/python.pxd',
                                 ],
-                       **pkgconfig('"evas >= 0.9.9.040"'))
+                       **pkgconfig('"evas >= 0.9.9.040"')
+                       )
+
 
-headers = ['evas/evas.c_evas.pxd',
-           'evas/evas.c_evas.h',
-           'evas/python_evas_utils.h',
+headers = ['evas/evas.c_evas.h',
+           'include/evas/python_evas_utils.h',
+           'include/evas/c_evas.pxd',
+           'include/python.pxd',
            ]
 
+
 trove_classifiers = [
     "Development Status :: 3 - Alpha",
     "Environment :: Console :: Framebuffer",
@@ -58,6 +66,7 @@
     "Topic :: Software Development :: User Interfaces",
     ]
 
+
 long_description = """\
 Python bindings for Evas, part of Enlightenment Foundation Libraries.
 
@@ -80,6 +89,24 @@
 15, 16, 24 and 32bit color.
 """
 
+
+class evas_build_ext(build_ext):
+    def finalize_options(self):
+        build_ext.finalize_options(self)
+        self.include_dirs.append('include')
+
+
+class evas_install_headers(install_headers):
+    def finalize_options(self):
+        if self.install_dir is None:
+            instd = get_python_inc()
+        else:
+            instd = self.install_dir
+
+        self.install_dir = os.path.join(instd, 'evas')
+        install_headers.finalize_options(self)
+
+
 setup(name='python-evas',
       version='0.1.1',
       license='BSD',
@@ -94,4 +121,6 @@
       headers=headers,
       ext_modules=[evasmodule],
       zip_safe=False,
+      cmdclass={'build_ext': evas_build_ext,
+                'install_headers': evas_install_headers},
       )

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-ecore/include




Log Message:
Directory /cvs/e/e17/proto/python-efl/python-ecore/include added to the repository

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-ecore/include/ecore/evas




Log Message:
Directory /cvs/e/e17/proto/python-efl/python-ecore/include/ecore/evas added to the repository

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-ecore/include/ecore




Log Message:
Directory /cvs/e/e17/proto/python-efl/python-ecore/include/ecore added to the repository

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-ecore/include/ecore


Added Files:
	c_ecore.pxd 


Log Message:
Organized and changed code to use Cython instead of Pyrex.

 - moved headers (.pxd) to include directory
 - changed README and setup.* to use Cython
 - using python.pxd from python-evas
 - fixed some typos

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-ecore/include/ecore/evas


Added Files:
	c_ecore_evas.pxd 


Log Message:
Organized and changed code to use Cython instead of Pyrex.

 - moved headers (.pxd) to include directory
 - changed README and setup.* to use Cython
 - using python.pxd from python-evas
 - fixed some typos

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-ecore/ecore


Modified Files:
	ecore.c_ecore.pyx ecore.c_ecore_fd_handler.pxi 
Removed Files:
	ecore.c_ecore.pxd python.pxd 


Log Message:
Organized and changed code to use Cython instead of Pyrex.

 - moved headers (.pxd) to include directory
 - changed README and setup.* to use Cython
 - using python.pxd from python-evas
 - fixed some typos

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore.pyx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore.c_ecore.pyx	29 Sep 2007 00:32:30 -0000	1.5
+++ ecore.c_ecore.pyx	30 Sep 2007 22:18:51 -0000	1.6
@@ -1,4 +1,4 @@
-cimport python
+cimport evas.python as python
 
 __extra_epydoc_fields__ = (
     ("parm", "Parameter", "Parameters"), # epydoc don't support pyrex properly
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_fd_handler.pxi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore.c_ecore_fd_handler.pxi	29 Sep 2007 00:32:30 -0000	1.5
+++ ecore.c_ecore_fd_handler.pxi	30 Sep 2007 22:18:51 -0000	1.6
@@ -136,14 +136,14 @@
         def __get__(self):
             return self.fd_get()
 
-    def active_get(self, int flags_query):
+    def active_get(self, int flags):
         """Return if read, write or error, or a combination thereof, is
            active on the file descriptor of the given FD handler.
 
            @rtype: bool
         """
         cdef Ecore_Fd_Handler_Flags v
-        v = <Ecore_Fd_Handler_Flags>flags_query
+        v = <Ecore_Fd_Handler_Flags>flags
         return bool(ecore_main_fd_handler_active_get(self.obj, v))
 
 
@@ -158,7 +158,7 @@
          - ECORE_FD_ALL
         """
         cdef Ecore_Fd_Handler_Flags v
-        v = <Ecore_Fd_Handler_Flags>flags_query
+        v = <Ecore_Fd_Handler_Flags>flags
         ecore_main_fd_handler_active_set(self.obj, v)
 
     def can_read(self):

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-ecore


Modified Files:
	README setup.cfg setup.py 


Log Message:
Organized and changed code to use Cython instead of Pyrex.

 - moved headers (.pxd) to include directory
 - changed README and setup.* to use Cython
 - using python.pxd from python-evas
 - fixed some typos

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- README	2 Sep 2007 15:11:54 -0000	1.5
+++ README	30 Sep 2007 22:18:51 -0000	1.6
@@ -5,7 +5,7 @@
 
  * Evas >= 0.9.9.040
  * Ecore >= 0.9.9.040
- * Pyrex >= 0.9.5
+ * Cython from Mercurial repository (http://www.cython.org/hg/)
  * Python-Evas
  * Python >= 2.4
  * Python-setuptools >= 0.6_rc3
@@ -25,7 +25,7 @@
         python setup.py install
 
 You can choose where to install by using command options, see output
-of "python setup.py $COMMAND --help", example:
+of "python setup.py <command> --help", example:
 
         python setup.py install --help
 
@@ -37,18 +37,19 @@
 
 If you get the following error during build_ext:
 
-        ecore/ecore.c_ecore.c:14:31: error: python_evas_utils.h: No such file or directory
+        ecore/ecore.c_ecore.pyx:1:8: 'evas.python.pxd' not found
 
-Means that either python_evas_utils.h was not installed or it is placed
+Means that either evas/python.pxd was not installed or it is placed
 at an non-standard place.
 
 If it's not installed at all, please do so by:
 
         # copy and extract python-evas to 'src/python-evas', then:
         cd src/python-evas
+        # read README
         python setup.py install_headers
 
-If it's installed at a non-standard place, you can specify it with
-"build_ext --include-dirs":
+If it's installed at a non-standard place, you can specify the same path you
+used to install python-evas to build_ext with "--include-dirs":
 
-        python setup.py build_ext --include-dirs $PYTHON_EVAS_UTILS_H_PATH
+        python setup.py build_ext --include-dirs <path>
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/setup.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- setup.cfg	24 Jul 2007 14:42:04 -0000	1.4
+++ setup.cfg	30 Sep 2007 22:18:51 -0000	1.5
@@ -6,6 +6,3 @@
 build_requires=ecore >= 0.9.9.040, evas >= 0.9.9.040
 group=System Environment/Libraries
 release=1
-
-[build_ext]
-include_dirs=ecore:ecore/evas
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/setup.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- setup.py	4 Sep 2007 18:50:39 -0000	1.13
+++ setup.py	30 Sep 2007 22:18:51 -0000	1.14
@@ -4,12 +4,11 @@
 from ez_setup import use_setuptools
 use_setuptools('0.6c3')
 
-import distutils.sysconfig
 from setuptools import setup, find_packages, Extension
+from distutils.sysconfig import get_python_inc
 import commands
 
-
-python_inc = distutils.sysconfig.get_python_inc()
+from Cython.Distutils import build_ext
 
 
 def pkgconfig(*packages, **kw):
@@ -34,15 +33,14 @@
                                  'ecore/ecore.c_ecore_idle_enterer.pxi',
                                  'ecore/ecore.c_ecore_idle_exiter.pxi',
                                  'ecore/ecore.c_ecore_fd_handler.pxi',
-                                 'ecore/ecore.c_ecore.pxd',
-                                 'ecore/python.pxd',
+                                 'include/ecore/c_ecore.pxd',
                                  ],
                         **pkgconfig('"ecore >= 0.9.9.040"'))
 
+
 ecoreevasmodule = Extension('ecore.evas.c_ecore_evas',
                             sources=['ecore/evas/ecore.evas.c_ecore_evas.pyx'],
-                            depends=['ecore/evas/ecore.evas.c_ecore_evas.pxd',
-                                     'ecore/evas/ecore.evas.c_ecore_evas_base.pxi',
+                            depends=['ecore/evas/ecore.evas.c_ecore_evas_base.pxi',
                                      'ecore/evas/ecore.evas.c_ecore_evas_software_x11.pxi',
                                      'ecore/evas/ecore.evas.c_ecore_evas_gl_x11.pxi',
                                      'ecore/evas/ecore.evas.c_ecore_evas_xrender_x11.pxi',
@@ -50,11 +48,10 @@
 #                                     'ecore/evas/ecore.evas.c_ecore_evas_directfb.pxi',
                                      'ecore/evas/ecore.evas.c_ecore_evas_buffer.pxi',
                                      'ecore/evas/ecore.evas.c_ecore_evas_software_x11_16.pxi',
-                                     'ecore/python.pxd',
+                                     'include/ecore/evas/c_ecore_evas.pxd',
                                      ],
                             **pkgconfig('"ecore-evas >= 0.9.9.040"'))
 
-include_dirs = [os.path.join(python_inc, "python-evas")]
 
 trove_classifiers = [
     "Development Status :: 3 - Alpha",
@@ -70,6 +67,7 @@
     "Topic :: Software Development :: User Interfaces",
     ]
 
+
 long_description = """\
 Python bindings for Ecore and Ecore/Evas, part of Enlightenment Foundation Libraries.
 
@@ -87,6 +85,13 @@
 other parameters.
 """
 
+
+class ecore_build_ext(build_ext):
+    def finalize_options(self):
+        build_ext.finalize_options(self)
+        self.include_dirs.extend(['include', get_python_inc()])
+
+
 setup(name='python-ecore',
       version='0.1.1',
       license='BSD',
@@ -100,7 +105,7 @@
       packages=find_packages(),
       install_requires=['python-evas>=0.1.1'],
       setup_requires=['python-evas>=0.1.1'],
-      include_dirs=include_dirs,
       ext_modules=[ecoremodule, ecoreevasmodule],
       zip_safe=False,
+      cmdclass={'build_ext': ecore_build_ext,},
       )

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-ecore/ecore/evas


Modified Files:
	ecore.evas.c_ecore_evas.pyx 
Removed Files:
	ecore.evas.c_ecore_evas.pxd 


Log Message:
Organized and changed code to use Cython instead of Pyrex.

 - moved headers (.pxd) to include directory
 - changed README and setup.* to use Cython
 - using python.pxd from python-evas
 - fixed some typos

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/evas/ecore.evas.c_ecore_evas.pyx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ecore.evas.c_ecore_evas.pyx	6 Sep 2007 04:17:49 -0000	1.4
+++ ecore.evas.c_ecore_evas.pyx	30 Sep 2007 22:18:52 -0000	1.5
@@ -1,4 +1,4 @@
-cimport python
+cimport evas.python as python
 import evas.c_evas

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-edje/include/edje




Log Message:
Directory /cvs/e/e17/proto/python-efl/python-edje/include/edje added to the repository

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-edje/include




Log Message:
Directory /cvs/e/e17/proto/python-efl/python-edje/include added to the repository

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-edje/include/edje


Added Files:
	c_edje.pxd 


Log Message:
Organized and changed code to use Cython instead of Pyrex.

 - moved headers (.pxd) to include directory
 - changed README and setup.py to use Cython
 - using python.pxd from python-evas
 - fixed namespace issue

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-edje


Modified Files:
	README setup.py 


Log Message:
Organized and changed code to use Cython instead of Pyrex.

 - moved headers (.pxd) to include directory
 - changed README and setup.py to use Cython
 - using python.pxd from python-evas
 - fixed namespace issue

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-edje/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- README	24 Jul 2007 14:42:04 -0000	1.3
+++ README	30 Sep 2007 22:35:31 -0000	1.4
@@ -9,7 +9,7 @@
  * Ecore >= 0.9.9.040   (indirect, Edje dependency)
  * Evas >= 0.9.9.040
  * Python-Evas
- * Pyrex >= 0.9.5
+ * Cython from Mercurial repository (http://www.cython.org/hg/)
  * Python >= 2.4
  * Python-setuptools >= 0.6_rc3
 
@@ -21,7 +21,6 @@
 
 Build::
 
-        python setup.py build_ext
         python setup.py build
 
 Install::
@@ -29,7 +28,7 @@
         python setup.py install
 
 You can choose where to install by using command options, see output
-of "python setup.py $COMMAND --help", example:
+of "python setup.py <command> --help", example:
 
         python setup.py install --help
 
@@ -41,19 +40,19 @@
 
 If you get the following error during build_ext:
 
-        edje.c_edje.pxd:1:8: 'evas.c_evas.pxd' not found
-        edje.c_edje.pxd:104:4: 'Evas_List' is not declared
+        include/edje/c_edje.pxd:1:8: 'evas.c_evas.pxd' not found
 
-Means that either evas.c_evas.pxd was not installed or it is placed
+Means that either evas/c_evas.pxd was not installed or it is placed
 at an non-standard place.
 
 If it's not installed at all, please do so by:
 
         # copy and extract python-evas to 'src/python-evas', then:
         cd src/python-evas
+        # read README
         python setup.py install_headers
 
-If it's installed at a non-standard place, you can specify it with
-"build_ext --include-dirs":
+If it's installed at a non-standard place, you can specify the same path you
+used to install python-evas to build_ext with "--include-dirs":
 
-        python setup.py build_ext --include-dirs $EVAS_PXD_PATH
+        python setup.py build_ext --include-dirs <path>
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-edje/setup.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- setup.py	4 Sep 2007 18:50:39 -0000	1.6
+++ setup.py	30 Sep 2007 22:35:31 -0000	1.7
@@ -4,12 +4,11 @@
 from ez_setup import use_setuptools
 use_setuptools('0.6c3')
 
-import distutils.sysconfig
 from setuptools import setup, find_packages, Extension
+from distutils.sysconfig import get_python_inc
 import commands
 
-
-python_inc = distutils.sysconfig.get_python_inc()
+from Cython.Distutils import build_ext
 
 
 def pkgconfig(*packages, **kw):
@@ -29,13 +28,12 @@
 edjemodule = Extension('edje.c_edje',
                        sources=['edje/edje.c_edje.pyx',
                                 ],
-                       depends=['edje/edje.c_edje.pxd',
-                                'edje/python.pxd',
+                       depends=['edje/edje.c_edje_object.pxi',
+                                'edje/edje.c_edje_message.pxi',
+                                'include/edje/c_edje.pxd',
                                 ],
                        **pkgconfig('"edje >= 0.5.0.040"'))
 
-include_dirs = [os.path.join(python_inc, "python-evas")]
-
 
 trove_classifiers = [
     "Development Status :: 3 - Alpha",
@@ -51,6 +49,7 @@
     "Topic :: Software Development :: User Interfaces",
     ]
 
+
 long_description = """\
 Python bindings for Edje, part of Enlightenment Foundation Libraries.
 
@@ -93,6 +92,12 @@
 """
 
 
+class edje_build_ext(build_ext):
+    def finalize_options(self):
+        build_ext.finalize_options(self)
+        self.include_dirs.extend(['include', get_python_inc()])
+
+
 setup(name='python-edje',
       version='0.1.1',
       license='BSD',
@@ -106,7 +111,7 @@
       packages=find_packages(),
       install_requires=['python-evas>=0.1.1'],
       setup_requires=['python-evas>=0.1.1'],
-      include_dirs=include_dirs,
       ext_modules=[edjemodule],
       zip_safe=False,
+      cmdclass={'build_ext': edje_build_ext,},
       )

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-edje/edje


Modified Files:
	edje.c_edje.pyx edje.c_edje_object.pxi 
Removed Files:
	edje.c_edje.pxd python.pxd 


Log Message:
Organized and changed code to use Cython instead of Pyrex.

 - moved headers (.pxd) to include directory
 - changed README and setup.py to use Cython
 - using python.pxd from python-evas
 - fixed namespace issue

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-edje/edje/edje.c_edje.pyx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- edje.c_edje.pyx	6 Sep 2007 23:02:28 -0000	1.4
+++ edje.c_edje.pyx	30 Sep 2007 22:35:31 -0000	1.5
@@ -1,4 +1,5 @@
-cimport python
+cimport evas.python as python
+cimport evas.c_evas
 import evas.c_evas
 
 def init():
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-edje/edje/edje.c_edje_object.pxi,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- edje.c_edje_object.pxi	25 Sep 2007 13:36:40 -0000	1.17
+++ edje.c_edje_object.pxi	30 Sep 2007 22:35:31 -0000	1.18
@@ -1,7 +1,8 @@
 # This file is included verbatim by edje.c_edje.pyx
-
+cimport evas.c_evas as c_evas
 import traceback
 
+
 cdef void text_change_cb(void *data, evas.c_evas.Evas_Object *obj, char *part):
     cdef Edje self
     self = <Edje>data
@@ -79,10 +80,10 @@
     def __new__(self, *a, **ka):
         self._signal_callbacks = {}
 
-    def __init__(self, evas.c_evas.Canvas canvas not None, **kargs):
+    def __init__(self, c_evas.Canvas canvas not None, **kargs):
         evas.c_evas.Object.__init__(self, canvas)
         if self.obj == NULL:
-            self._set_obj(edje_object_add(self._evas.obj))
+            self._set_obj(edje_object_add(self.evas.obj))
         self._set_common_params(**kargs)
 
     def __free_wrapper_resources(self, ed):
@@ -90,7 +91,7 @@
         self._text_change_cb = None
         self._message_handler_cb = None
 
-    cdef int _set_obj(self, evas.c_evas.Evas_Object *obj) except 0:
+    cdef int _set_obj(self, c_evas.Evas_Object *obj) except 0:
         cdef int r
         r = evas.c_evas.Object._set_obj(self, obj)
         if r == 1:
@@ -509,7 +510,7 @@
                 return
 
             item_type = type(data[0])
-            if item_type not in (long, int, float, str, unicode):
+            if item_type not in (long, int, float, str): # FIXME: add unicode
                 raise TypeError("invalid message list type '%s'" %
                                 item_type.__name__)

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-emotion/include/emotion




Log Message:
Directory /cvs/e/e17/proto/python-efl/python-emotion/include/emotion added to the repository

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-emotion/include




Log Message:
Directory /cvs/e/e17/proto/python-efl/python-emotion/include added to the repository

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-emotion/include/emotion


Added Files:
	c_emotion.pxd 


Log Message:
Organized and changed code to use Cython instead of Pyrex.

 - moved headers (.pxd) to include directory
 - changed README and setup.py to use Cython
 - fixed namespace and typo issues

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-emotion


Modified Files:
	README setup.py 


Log Message:
Organized and changed code to use Cython instead of Pyrex.

 - moved headers (.pxd) to include directory
 - changed README and setup.py to use Cython
 - fixed namespace and typo issues

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-emotion/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- README	24 Jul 2007 15:14:46 -0000	1.4
+++ README	30 Sep 2007 22:43:10 -0000	1.5
@@ -7,7 +7,7 @@
  * Evas >= 0.9.9.040  (indirect, Emotion dependency)
  * Ecore >= 0.9.9.040 (indirect, Emotion dependency)
  * Python-Evas
- * Pyrex >= 0.9.5
+ * Cython from Mercurial repository (http://www.cython.org/hg/)
  * Python >= 2.4
  * Python-setuptools >= 0.6_rc3
 
@@ -19,7 +19,6 @@
 
 Build::
 
-        python setup.py build_ext
         python setup.py build
 
 Install::
@@ -27,7 +26,7 @@
         python setup.py install
 
 You can choose where to install by using command options, see output
-of "python setup.py $COMMAND --help", example:
+of "python setup.py <command> --help", example:
 
         python setup.py install --help
 
@@ -39,19 +38,19 @@
 
 If you get the following error during build_ext:
 
-        emotion.c_emotion.pxd:1:8: 'evas.c_evas.pxd' not found
-        emotion.c_emotion.pxd:53:4: 'Evas_Object' is not declared
+        include/emotion/c_emotion.pxd:1:8: 'evas.c_evas.pxd' not found
 
-Means that either evas.c_evas.pxd was not installed or it is placed
+Means that either evas/c_evas.pxd was not installed or it is placed
 at an non-standard place.
 
 If it's not installed at all, please do so by:
 
         # copy and extract python-evas to 'src/python-evas', then:
         cd src/python-evas
+        # read README
         python setup.py install_headers
 
-If it's installed at a non-standard place, you can specify it with
-"build_ext --include-dirs":
+If it's installed at a non-standard place, you can specify the same path you
+used to install python-evas to build_ext with "--include-dirs":
 
-        python setup.py build_ext --include-dirs $EVAS_PXD_PATH
+        python setup.py build_ext --include-dirs <path>
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-emotion/setup.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- setup.py	4 Sep 2007 18:50:39 -0000	1.5
+++ setup.py	30 Sep 2007 22:43:10 -0000	1.6
@@ -4,12 +4,11 @@
 from ez_setup import use_setuptools
 use_setuptools('0.6c3')
 
-import distutils.sysconfig
 from setuptools import setup, find_packages, Extension
+from distutils.sysconfig import get_python_inc
 import commands
 
-
-python_inc = distutils.sysconfig.get_python_inc()
+from Cython.Distutils import build_ext
 
 
 def pkgconfig(*packages, **kw):
@@ -29,14 +28,11 @@
 emotionmodule = Extension('emotion.c_emotion',
                           sources=['emotion/emotion.c_emotion.pyx',
                                    ],
-                          depends=['emotion/emotion.c_emotion.pxd',
+                          depends=['include/emotion/c_emotion.pxd',
                                    ],
                           **pkgconfig('"emotion >= 0.0.1.007"'))
 
 
-include_dirs = [os.path.join(python_inc, "python-evas")]
-
-
 trove_classifiers = [
     "Development Status :: 3 - Alpha",
     "Environment :: Console :: Framebuffer",
@@ -51,6 +47,7 @@
     "Topic :: Software Development :: User Interfaces",
     ]
 
+
 long_description = """\
 Python bindings for Emotion, part of Enlightenment Foundation Libraries.
 
@@ -61,6 +58,13 @@
 MPEG2, etc) is avalible using Emotion.
 """
 
+
+class emotion_build_ext(build_ext):
+    def finalize_options(self):
+        build_ext.finalize_options(self)
+        self.include_dirs.extend(['include', get_python_inc()])
+
+
 setup(name='python-emotion',
       version='0.1.1',
       license='BSD',
@@ -72,9 +76,9 @@
       keywords='wrapper binding enlightenment graphics raster evas canvas multimida playback xine gstreamer',
       classifiers=trove_classifiers,
       packages=find_packages(),
-      include_dirs=include_dirs,
       install_requires=['python-evas>=0.1.1'],
       setup_requires=['python-evas>=0.1.1'],
       ext_modules=[emotionmodule],
       zip_safe=False,
+      cmdclass={'build_ext': emotion_build_ext,},
       )

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-emotion/emotion


Modified Files:
	emotion.c_emotion.pyx 
Removed Files:
	emotion.c_emotion.pxd 


Log Message:
Organized and changed code to use Cython instead of Pyrex.

 - moved headers (.pxd) to include directory
 - changed README and setup.py to use Cython
 - fixed namespace and typo issues

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-emotion/emotion/emotion.c_emotion.pyx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- emotion.c_emotion.pyx	2 Sep 2007 15:11:54 -0000	1.6
+++ emotion.c_emotion.pyx	30 Sep 2007 22:43:10 -0000	1.7
@@ -1,3 +1,4 @@
+cimport evas.c_evas as c_evas
 import evas.c_evas
 
 cdef void _emotion_callback(void *data, evas.c_evas.Evas_Object *o, void *ei):
@@ -22,10 +23,10 @@
     def __new__(self, *a, **ka):
         self._emotion_callbacks = {}
 
-    def __init__(self, evas.c_evas.Canvas canvas not None, **kargs):
+    def __init__(self, c_evas.Canvas canvas not None, **kargs):
         evas.c_evas.Object.__init__(self, canvas)
         if self.obj == NULL:
-            self._set_obj(emotion_object_add(self._evas.obj))
+            self._set_obj(emotion_object_add(self.evas.obj))
         self._set_common_params(**kargs)
 
     def _set_common_params(self,

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-e_dbus


Modified Files:
	README 


Log Message:
Cosmetic change to standardize python-efl READMEs.

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-e_dbus/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- README	28 Sep 2007 13:33:03 -0000	1.1
+++ README	30 Sep 2007 22:49:12 -0000	1.2
@@ -24,7 +24,7 @@
         python setup.py install
 
 You can choose where to install by using command options, see output
-of "python setup.py $COMMAND --help", example:
+of "python setup.py <command> --help", example:
 
         python setup.py install --help

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas


Modified Files:
	MANIFEST.in 


Log Message:
Fix python-efl manifest files.

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/MANIFEST.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- MANIFEST.in	28 Sep 2007 18:06:26 -0000	1.2
+++ MANIFEST.in	1 Oct 2007 03:44:23 -0000	1.3
@@ -1,5 +1,6 @@
-recursive-include evas *.pxd *.pyx *.pxi *.py *.h
+recursive-include evas *.pyx *.pxi *.py *.h
 recursive-include tests *.py *.png
+recursive-include include *.pxd *.h
 include ez_setup.py gen-doc-api.sh
 prune evas/evas.c_evas.pxi
 include AUTHORS COPYING-PLAIN COPYING README

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-emotion


Modified Files:
	MANIFEST.in 


Log Message:
Fix python-efl manifest files.

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-emotion/MANIFEST.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- MANIFEST.in	11 May 2007 02:23:23 -0000	1.1
+++ MANIFEST.in	1 Oct 2007 03:44:23 -0000	1.2
@@ -1,4 +1,5 @@
-recursive-include emotion *.pxd *.pyx *.py
+recursive-include emotion *.pyx *.py
 recursive-include examples *.py
+recursive-include include *.pxd
 include ez_setup.py
 include AUTHORS COPYING-PLAIN COPYING README

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-edje


Modified Files:
	MANIFEST.in 


Log Message:
Fix python-efl manifest files.

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-edje/MANIFEST.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- MANIFEST.in	11 May 2007 02:20:02 -0000	1.1
+++ MANIFEST.in	1 Oct 2007 03:44:23 -0000	1.2
@@ -1,4 +1,5 @@
-recursive-include edje *.pxd *.pyx *.pxi *.py
+recursive-include edje *.pyx *.pxi *.py
 recursive-include tests *.py *.edc *.edj
+recursive-include include *.pxd
 include ez_setup.py
 include AUTHORS COPYING-PLAIN COPYING README

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-ecore


Modified Files:
	MANIFEST.in 


Log Message:
Fix python-efl manifest files.

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/MANIFEST.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- MANIFEST.in	29 Sep 2007 00:32:30 -0000	1.3
+++ MANIFEST.in	1 Oct 2007 03:44:23 -0000	1.4
@@ -1,5 +1,6 @@
-recursive-include ecore *.pxd *.pyx *.pxi *.py
+recursive-include ecore *.pyx *.pxi *.py
 recursive-include tests *.py
 recursive-include examples *.py
+recursive-include include *.pxd
 include ez_setup.py gen-doc-api.sh
 include AUTHORS COPYING-PLAIN COPYING README

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-e_dbus


Modified Files:
	module.c 
Added Files:
	AUTHORS COPYING COPYING-PLAIN MANIFEST.in 


Log Message:
Importing missing files.

 - imported authors, license and manifest files
 - fixed author e-mail address

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-e_dbus/module.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- module.c	28 Sep 2007 15:29:41 -0000	1.2
+++ module.c	1 Oct 2007 03:50:23 -0000	1.3
@@ -1,8 +1,6 @@
 /*
  * Glue code to attach the Ecore main loop to D-Bus from within Python.
- *
- * Copyright (C) 2007 INdT
- * @author Ulisses Furquim <ulisses.silva@...>
+ * @author Ulisses Furquim <ulissesf@...>
  *
  * @copyright BSD
  */

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas/evas


Modified Files:
	evas.c_evas_object.pxi evas.c_evas_object_callbacks.pxi 
	evas.c_evas_object_image.pxi evas.c_evas_object_smart.pxi 


Log Message:
Make python-efl thread-safe.

 - acquiring/releasing GIL using 'with GIL' annotation
 - bumped version number

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object.pxi,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- evas.c_evas_object.pxi	28 Sep 2007 18:06:26 -0000	1.16
+++ evas.c_evas_object.pxi	1 Oct 2007 04:31:38 -0000	1.17
@@ -24,7 +24,8 @@
     return 1
 
 
-cdef void obj_free_cb(void *data, Evas *e, Evas_Object *obj, void *event_info):
+cdef void obj_free_cb(void *data, Evas *e,
+                      Evas_Object *obj, void *event_info) with GIL:
     cdef Object self
     self = <Object>data
 
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_callbacks.pxi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas.c_evas_object_callbacks.pxi	21 Sep 2007 23:56:05 -0000	1.3
+++ evas.c_evas_object_callbacks.pxi	1 Oct 2007 04:31:38 -0000	1.4
@@ -24,91 +24,104 @@
     return 1
 
 
-cdef void cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void *e_inf):
+cdef void cb_mouse_in(void *data, Evas *e,
+                      Evas_Object *obj, void *e_inf) with GIL:
     cdef EventMouseIn event
     event = EventMouseIn()
     event._set_obj(e_inf)
     cb_dispatcher(<Object>data, event, EVAS_CALLBACK_MOUSE_IN)
 
 
-cdef void cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *e_inf):
+cdef void cb_mouse_out(void *data, Evas *e,
+                       Evas_Object *obj, void *e_inf) with GIL:
     cdef EventMouseOut event
     event = EventMouseOut()
     event._set_obj(e_inf)
     cb_dispatcher(<Object>data, event, EVAS_CALLBACK_MOUSE_OUT)
 
 
-cdef void cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *e_inf):
+cdef void cb_mouse_down(void *data, Evas *e,
+                        Evas_Object *obj, void *e_inf) with GIL:
     cdef EventMouseDown event
     event = EventMouseDown()
     event._set_obj(e_inf)
     cb_dispatcher(<Object>data, event, EVAS_CALLBACK_MOUSE_DOWN)
 
 
-cdef void cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *e_inf):
+cdef void cb_mouse_up(void *data, Evas *e,
+                      Evas_Object *obj, void *e_inf) with GIL:
     cdef EventMouseUp event
     event = EventMouseUp()
     event._set_obj(e_inf)
     cb_dispatcher(<Object>data, event, EVAS_CALLBACK_MOUSE_UP)
 
 
-cdef void cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *e_inf):
+cdef void cb_mouse_move(void *data, Evas *e,
+                        Evas_Object *obj, void *e_inf) with GIL:
     cdef EventMouseMove event
     event = EventMouseMove()
     event._set_obj(e_inf)
     cb_dispatcher(<Object>data, event, EVAS_CALLBACK_MOUSE_MOVE)
 
 
-cdef void cb_mouse_wheel(void *data, Evas *e, Evas_Object *obj, void *e_inf):
+cdef void cb_mouse_wheel(void *data, Evas *e,
+                         Evas_Object *obj, void *e_inf) with GIL:
     cdef EventMouseWheel event
     event = EventMouseWheel()
     event._set_obj(e_inf)
     cb_dispatcher(<Object>data, event, EVAS_CALLBACK_MOUSE_WHEEL)
 
 
-cdef void cb_free(void *data, Evas *e, Evas_Object *obj, void *e_inf):
+cdef void cb_free(void *data, Evas *e,
+                  Evas_Object *obj, void *e_inf) with GIL:
     cb_dispatcher2(<Object>data, EVAS_CALLBACK_FREE)
 
 
-cdef void cb_key_down(void *data, Evas *e, Evas_Object *obj, void *e_inf):
+cdef void cb_key_down(void *data, Evas *e,
+                      Evas_Object *obj, void *e_inf) with GIL:
     cdef EventKeyDown event
     event = EventKeyDown()
     event._set_obj(e_inf)
     cb_dispatcher(<Object>data, event, EVAS_CALLBACK_KEY_DOWN)
 
 
-cdef void cb_key_up(void *data, Evas *e, Evas_Object *obj, void *e_inf):
+cdef void cb_key_up(void *data, Evas *e,
+                    Evas_Object *obj, void *e_inf) with GIL:
     cdef EventKeyUp event
     event = EventKeyUp()
     event._set_obj(e_inf)
     cb_dispatcher(<Object>data, event, EVAS_CALLBACK_KEY_UP)
 
 
-cdef void cb_focus_in(void *data, Evas *e, Evas_Object *obj, void *e_inf):
+cdef void cb_focus_in(void *data, Evas *e,
+                      Evas_Object *obj, void *e_inf) with GIL:
     cb_dispatcher2(<Object>data, EVAS_CALLBACK_FOCUS_IN)
 
 
-cdef void cb_focus_out(void *data, Evas *e, Evas_Object *obj, void *e_inf):
+cdef void cb_focus_out(void *data, Evas *e,
+                       Evas_Object *obj, void *e_inf) with GIL:
     cb_dispatcher2(<Object>data, EVAS_CALLBACK_FOCUS_OUT)
 
 
-cdef void cb_show(void *data, Evas *e, Evas_Object *obj, void *e_inf):
+cdef void cb_show(void *data, Evas *e, Evas_Object *obj, void *e_inf) with GIL:
     cb_dispatcher2(<Object>data, EVAS_CALLBACK_SHOW)
 
 
-cdef void cb_hide(void *data, Evas *e, Evas_Object *obj, void *e_inf):
+cdef void cb_hide(void *data, Evas *e, Evas_Object *obj, void *e_inf) with GIL:
     cb_dispatcher2(<Object>data, EVAS_CALLBACK_HIDE)
 
 
-cdef void cb_move(void *data, Evas *e, Evas_Object *obj, void *e_inf):
+cdef void cb_move(void *data, Evas *e, Evas_Object *obj, void *e_inf) with GIL:
     cb_dispatcher2(<Object>data, EVAS_CALLBACK_MOVE)
 
 
-cdef void cb_resize(void *data, Evas *e, Evas_Object *obj, void *e_inf):
+cdef void cb_resize(void *data, Evas *e,
+                    Evas_Object *obj, void *e_inf) with GIL:
     cb_dispatcher2(<Object>data, EVAS_CALLBACK_RESIZE)
 
 
-cdef void cb_restack(void *data, Evas *e, Evas_Object *obj, void *e_inf):
+cdef void cb_restack(void *data, Evas *e,
+                     Evas_Object *obj, void *e_inf) with GIL:
     cb_dispatcher2(<Object>data, EVAS_CALLBACK_RESTACK)
 
 
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_image.pxi,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evas.c_evas_object_image.pxi	28 Sep 2007 18:06:26 -0000	1.6
+++ evas.c_evas_object_image.pxi	1 Oct 2007 04:31:38 -0000	1.7
@@ -345,8 +345,9 @@
 
 
 
-cdef void _cb_on_filled_image_resize(void *data, Evas *e, Evas_Object *obj,
-                                     void *event_info):
+cdef void _cb_on_filled_image_resize(void *data, Evas *e,
+                                     Evas_Object *obj,
+                                     void *event_info) with GIL:
     cdef int w, h
     evas_object_geometry_get(obj, NULL, NULL, &w, &h)
     evas_object_image_fill_set(obj, 0, 0, w, h)
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_smart.pxi,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- evas.c_evas_object_smart.pxi	28 Sep 2007 18:06:26 -0000	1.17
+++ evas.c_evas_object_smart.pxi	1 Oct 2007 04:31:38 -0000	1.18
@@ -7,7 +7,7 @@
 
 import traceback
 
-cdef void _smart_object_delete(Evas_Object *o):
+cdef void _smart_object_delete(Evas_Object *o) with GIL:
     cdef SmartObject obj
     obj = <SmartObject>evas_object_data_get(o, "python-evas")
 
@@ -60,7 +60,8 @@
     obj._m_clip_unset = None
 
 
-cdef void _smart_object_move(Evas_Object *o, Evas_Coord x, Evas_Coord y):
+cdef void _smart_object_move(Evas_Object *o,
+                             Evas_Coord x, Evas_Coord y) with GIL:
     cdef SmartObject obj
     obj = <SmartObject>evas_object_data_get(o, "python-evas")
     if obj._m_move is not None:
@@ -70,7 +71,8 @@
             traceback.print_exc()
 
 
-cdef void _smart_object_resize(Evas_Object *o, Evas_Coord w, Evas_Coord h):
+cdef void _smart_object_resize(Evas_Object *o,
+                               Evas_Coord w, Evas_Coord h) with GIL:
     cdef SmartObject obj
     obj = <SmartObject>evas_object_data_get(o, "python-evas")
     if obj._m_resize is not None:
@@ -80,7 +82,7 @@
             traceback.print_exc()
 
 
-cdef void _smart_object_show(Evas_Object *o):
+cdef void _smart_object_show(Evas_Object *o) with GIL:
     cdef SmartObject obj
     obj = <SmartObject>evas_object_data_get(o, "python-evas")
     if obj._m_show is not None:
@@ -90,7 +92,7 @@
             traceback.print_exc()
 
 
-cdef void _smart_object_hide(Evas_Object *o):
+cdef void _smart_object_hide(Evas_Object *o) with GIL:
     cdef SmartObject obj
     obj = <SmartObject>evas_object_data_get(o, "python-evas")
     if obj._m_hide is not None:
@@ -100,7 +102,8 @@
             traceback.print_exc()
 
 
-cdef void _smart_object_color_set(Evas_Object *o, int r, int g, int b, int a):
+cdef void _smart_object_color_set(Evas_Object *o,
+                                  int r, int g, int b, int a) with GIL:
     cdef SmartObject obj
     obj = <SmartObject>evas_object_data_get(o, "python-evas")
     if obj._m_color_set is not None:
@@ -110,7 +113,7 @@
             traceback.print_exc()
 
 
-cdef void _smart_object_clip_set(Evas_Object *o, Evas_Object *clip):
+cdef void _smart_object_clip_set(Evas_Object *o, Evas_Object *clip) with GIL:
     cdef SmartObject obj
     cdef Object other
     obj = <SmartObject>evas_object_data_get(o, "python-evas")
@@ -122,7 +125,7 @@
             traceback.print_exc()
 
 
-cdef void _smart_object_clip_unset(Evas_Object *o):
+cdef void _smart_object_clip_unset(Evas_Object *o) with GIL:
     cdef SmartObject obj
     obj = <SmartObject>evas_object_data_get(o, "python-evas")
     if obj._m_clip_unset is not None:
@@ -132,7 +135,8 @@
             traceback.print_exc()
 
 
-cdef void _smart_callback(void *data, Evas_Object *o, void *event_info):
+cdef void _smart_callback(void *data,
+                          Evas_Object *o, void *event_info) with GIL:
     cdef SmartObject obj
     cdef object event, ei
     obj = <SmartObject>evas_object_data_get(o, "python-evas")

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas


Modified Files:
	setup.py 


Log Message:
Make python-efl thread-safe.

 - acquiring/releasing GIL using 'with GIL' annotation
 - bumped version number

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/setup.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- setup.py	30 Sep 2007 21:57:17 -0000	1.16
+++ setup.py	1 Oct 2007 04:31:38 -0000	1.17
@@ -108,7 +108,7 @@
 
 
 setup(name='python-evas',
-      version='0.1.1',
+      version='0.2.0',
       license='BSD',
       author='Gustavo Sverzut Barbieri',
       author_email='barbieri@...',

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-ecore/ecore/evas


Modified Files:
	ecore.evas.c_ecore_evas_base.pxi 


Log Message:
Make python-ecore thread-safe.

 - acquiring/releasing GIL using 'with GIL' annotation
 - bumped version number

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/evas/ecore.evas.c_ecore_evas_base.pxi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore.evas.c_ecore_evas_base.pxi	28 Sep 2007 20:39:09 -0000	1.7
+++ ecore.evas.c_ecore_evas_base.pxi	1 Oct 2007 04:34:47 -0000	1.8
@@ -9,7 +9,7 @@
     assert data != NULL, "Ecore_Evas is not wrapped by Python object."
     return <EcoreEvas>data
 
-cdef void resize_cb(Ecore_Evas *ee):
+cdef void resize_cb(Ecore_Evas *ee) with GIL:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -17,7 +17,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void move_cb(Ecore_Evas *ee):
+cdef void move_cb(Ecore_Evas *ee) with GIL:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -25,7 +25,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void show_cb(Ecore_Evas *ee):
+cdef void show_cb(Ecore_Evas *ee) with GIL:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -33,7 +33,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void hide_cb(Ecore_Evas *ee):
+cdef void hide_cb(Ecore_Evas *ee) with GIL:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -41,7 +41,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void delete_request_cb(Ecore_Evas *ee):
+cdef void delete_request_cb(Ecore_Evas *ee) with GIL:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -49,7 +49,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void destroy_cb(Ecore_Evas *ee):
+cdef void destroy_cb(Ecore_Evas *ee) with GIL:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -57,7 +57,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void focus_in_cb(Ecore_Evas *ee):
+cdef void focus_in_cb(Ecore_Evas *ee) with GIL:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -65,7 +65,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void focus_out_cb(Ecore_Evas *ee):
+cdef void focus_out_cb(Ecore_Evas *ee) with GIL:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -73,7 +73,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void sticky_cb(Ecore_Evas *ee):
+cdef void sticky_cb(Ecore_Evas *ee) with GIL:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -81,7 +81,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void unsticky_cb(Ecore_Evas *ee):
+cdef void unsticky_cb(Ecore_Evas *ee) with GIL:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -89,7 +89,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void mouse_in_cb(Ecore_Evas *ee):
+cdef void mouse_in_cb(Ecore_Evas *ee) with GIL:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -97,7 +97,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void mouse_out_cb(Ecore_Evas *ee):
+cdef void mouse_out_cb(Ecore_Evas *ee) with GIL:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -105,7 +105,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void pre_render_cb(Ecore_Evas *ee):
+cdef void pre_render_cb(Ecore_Evas *ee) with GIL:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -113,7 +113,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void post_render_cb(Ecore_Evas *ee):
+cdef void post_render_cb(Ecore_Evas *ee) with GIL:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-ecore


Modified Files:
	setup.cfg setup.py 


Log Message:
Make python-ecore thread-safe.

 - acquiring/releasing GIL using 'with GIL' annotation
 - bumped version number

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/setup.cfg,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- setup.cfg	30 Sep 2007 22:18:51 -0000	1.5
+++ setup.cfg	1 Oct 2007 04:34:47 -0000	1.6
@@ -2,7 +2,7 @@
 optimize=1
 
 [build_rpm]
-requires=ecore >= 0.9.9.040, evas >= 0.9.9.040, python-evas
-build_requires=ecore >= 0.9.9.040, evas >= 0.9.9.040
+requires=ecore >= 0.9.9.040, evas >= 0.9.9.040, python-evas >= 0.2.0
+build_requires=ecore >= 0.9.9.040, evas >= 0.9.9.040, python-evas >= 0.2.0
 group=System Environment/Libraries
 release=1
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/setup.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- setup.py	30 Sep 2007 22:18:51 -0000	1.14
+++ setup.py	1 Oct 2007 04:34:47 -0000	1.15
@@ -93,7 +93,7 @@
 
 
 setup(name='python-ecore',
-      version='0.1.1',
+      version='0.2.0',
       license='BSD',
       author='Gustavo Sverzut Barbieri',
       author_email='barbieri@...',
@@ -103,8 +103,8 @@
       keywords='wrapper binding enlightenment abstraction event ecore',
       classifiers=trove_classifiers,
       packages=find_packages(),
-      install_requires=['python-evas>=0.1.1'],
-      setup_requires=['python-evas>=0.1.1'],
+      install_requires=['python-evas>=0.2.0'],
+      setup_requires=['python-evas>=0.2.0'],
       ext_modules=[ecoremodule, ecoreevasmodule],
       zip_safe=False,
       cmdclass={'build_ext': ecore_build_ext,},

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-ecore/ecore


Modified Files:
	ecore.c_ecore.pyx ecore.c_ecore_animator.pxi 
	ecore.c_ecore_fd_handler.pxi ecore.c_ecore_idle_enterer.pxi 
	ecore.c_ecore_idle_exiter.pxi ecore.c_ecore_idler.pxi 
	ecore.c_ecore_timer.pxi 


Log Message:
Make python-ecore thread-safe.

 - acquiring/releasing GIL using 'with GIL' annotation
 - bumped version number

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore.pyx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ecore.c_ecore.pyx	30 Sep 2007 22:18:51 -0000	1.6
+++ ecore.c_ecore.pyx	1 Oct 2007 04:34:47 -0000	1.7
@@ -19,12 +19,16 @@
 
 def main_loop_begin():
     "Enter main loop, this function will not return until L{main_loop_quit()}."
+    python.Py_BEGIN_ALLOW_THREADS
     ecore_main_loop_begin()
+    python.Py_END_ALLOW_THREADS
 
 
 def main_loop_iterate():
     "Force main loop to process requests (timers, fd handlers, idlers, ...)"
+    python.Py_BEGIN_ALLOW_THREADS
     ecore_main_loop_iterate()
+    python.Py_END_ALLOW_THREADS
 
 
 def time_get():
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_animator.pxi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore.c_ecore_animator.pxi	29 Sep 2007 00:32:30 -0000	1.5
+++ ecore.c_ecore_animator.pxi	1 Oct 2007 04:34:47 -0000	1.6
@@ -2,7 +2,7 @@
 
 import traceback
 
-cdef int animator_cb(void *_td):
+cdef int animator_cb(void *_td) with GIL:
     cdef Animator obj
     cdef int r
 
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_fd_handler.pxi,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ecore.c_ecore_fd_handler.pxi	30 Sep 2007 22:18:51 -0000	1.6
+++ ecore.c_ecore_fd_handler.pxi	1 Oct 2007 04:34:47 -0000	1.7
@@ -2,7 +2,7 @@
 
 import traceback
 
-cdef void fd_handler_prepare_cb(void *_td, Ecore_Fd_Handler *fdh):
+cdef void fd_handler_prepare_cb(void *_td, Ecore_Fd_Handler *fdh) with GIL:
     cdef FdHandler obj
     cdef int r
 
@@ -27,7 +27,7 @@
     return ", ".join(flags)
 
 
-cdef int fd_handler_cb(void *_td, Ecore_Fd_Handler *fdh):
+cdef int fd_handler_cb(void *_td, Ecore_Fd_Handler *fdh) with GIL:
     cdef FdHandler obj
     cdef int r
 
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_idle_enterer.pxi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore.c_ecore_idle_enterer.pxi	29 Sep 2007 00:32:30 -0000	1.5
+++ ecore.c_ecore_idle_enterer.pxi	1 Oct 2007 04:34:47 -0000	1.6
@@ -2,7 +2,7 @@
 
 import traceback
 
-cdef int idle_enterer_cb(void *_td):
+cdef int idle_enterer_cb(void *_td) with GIL:
     cdef IdleEnterer obj
     cdef int r
 
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_idle_exiter.pxi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore.c_ecore_idle_exiter.pxi	29 Sep 2007 00:32:30 -0000	1.5
+++ ecore.c_ecore_idle_exiter.pxi	1 Oct 2007 04:34:47 -0000	1.6
@@ -2,7 +2,7 @@
 
 import traceback
 
-cdef int idle_exiter_cb(void *_td):
+cdef int idle_exiter_cb(void *_td) with GIL:
     cdef IdleExiter obj
     cdef int r
 
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_idler.pxi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore.c_ecore_idler.pxi	29 Sep 2007 00:32:30 -0000	1.5
+++ ecore.c_ecore_idler.pxi	1 Oct 2007 04:34:47 -0000	1.6
@@ -2,7 +2,7 @@
 
 import traceback
 
-cdef int idler_cb(void *_td):
+cdef int idler_cb(void *_td) with GIL:
     cdef Idler obj
     cdef int r
 
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_timer.pxi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore.c_ecore_timer.pxi	29 Sep 2007 00:32:30 -0000	1.5
+++ ecore.c_ecore_timer.pxi	1 Oct 2007 04:34:47 -0000	1.6
@@ -2,7 +2,7 @@
 
 import traceback
 
-cdef int timer_cb(void *_td):
+cdef int timer_cb(void *_td) with GIL:
     cdef Timer obj
     cdef int r

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-edje/edje


Modified Files:
	edje.c_edje_object.pxi 


Log Message:
Make python-edje thread-safe.

 - acquiring/releasing GIL using 'with GIL' annotation
 - bumped version number

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-edje/edje/edje.c_edje_object.pxi,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- edje.c_edje_object.pxi	30 Sep 2007 22:35:31 -0000	1.18
+++ edje.c_edje_object.pxi	1 Oct 2007 04:36:47 -0000	1.19
@@ -3,7 +3,8 @@
 import traceback
 
 
-cdef void text_change_cb(void *data, evas.c_evas.Evas_Object *obj, char *part):
+cdef void text_change_cb(void *data,
+                         evas.c_evas.Evas_Object *obj, char *part) with GIL:
     cdef Edje self
     self = <Edje>data
     if self._text_change_cb is None:
@@ -15,8 +16,10 @@
         traceback.print_exc()
 
 
-cdef void message_handler_cb(void *data, evas.c_evas.Evas_Object *obj,
-                             Edje_Message_Type type, int id, void *msg):
+cdef void message_handler_cb(void *data,
+                             evas.c_evas.Evas_Object *obj,
+                             Edje_Message_Type type,
+                             int id, void *msg) with GIL:
     cdef Edje self
     self = <Edje>data
     if self._message_handler_cb is None:
@@ -28,8 +31,9 @@
         traceback.print_exc()
 
 
-cdef void signal_cb(void *data, evas.c_evas.Evas_Object *obj,
-                    char *emission, char *source):
+cdef void signal_cb(void *data,
+                    evas.c_evas.Evas_Object *obj,
+                    char *emission, char *source) with GIL:
     cdef Edje self
     self = <Edje>evas.c_evas._Object_from_instance(<long>obj)
     lst = <object>data

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-edje


Modified Files:
	setup.cfg setup.py 


Log Message:
Make python-edje thread-safe.

 - acquiring/releasing GIL using 'with GIL' annotation
 - bumped version number

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-edje/setup.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- setup.cfg	24 Jul 2007 15:14:46 -0000	1.4
+++ setup.cfg	1 Oct 2007 04:36:47 -0000	1.5
@@ -2,7 +2,7 @@
 optimize=1
 
 [build_rpm]
-requires=edje >= 0.5.0.040, evas >= 0.9.9.040, python-evas >= 0.1.1
-build_requires=edje >= 0.5.0.040, evas >= 0.9.9.040, python-evas >= 0.1.1
+requires=edje >= 0.5.0.040, evas >= 0.9.9.040, python-evas >= 0.2.0
+build_requires=edje >= 0.5.0.040, evas >= 0.9.9.040, python-evas >= 0.2.0
 group=System Environment/Libraries
 release=1
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-edje/setup.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- setup.py	30 Sep 2007 22:35:31 -0000	1.7
+++ setup.py	1 Oct 2007 04:36:47 -0000	1.8
@@ -99,7 +99,7 @@
 
 
 setup(name='python-edje',
-      version='0.1.1',
+      version='0.2.0',
       license='BSD',
       author='Gustavo Sverzut Barbieri',
       author_email='barbieri@...',
@@ -109,8 +109,8 @@
       keywords='wrapper binding enlightenment graphics raster evas canvas theme',
       classifiers=trove_classifiers,
       packages=find_packages(),
-      install_requires=['python-evas>=0.1.1'],
-      setup_requires=['python-evas>=0.1.1'],
+      install_requires=['python-evas>=0.2.0'],
+      setup_requires=['python-evas>=0.2.0'],
       ext_modules=[edjemodule],
       zip_safe=False,
       cmdclass={'build_ext': edje_build_ext,},

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-emotion


Modified Files:
	setup.cfg setup.py 


Log Message:
Make python-emotion thread-safe.

 - acquiring/releasing GIL using 'with GIL' annotation
 - bumped version number

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-emotion/setup.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- setup.cfg	24 Jul 2007 15:14:46 -0000	1.3
+++ setup.cfg	1 Oct 2007 04:38:41 -0000	1.4
@@ -2,7 +2,7 @@
 optimize=1
 
 [build_rpm]
-requires=emotion >= 0.0.1.007, python-evas >= 0.1.1
-build_requires=emotion >= 0.0.1.007, python-evas >= 0.1.1
+requires=emotion >= 0.0.1.007, python-evas >= 0.2.0
+build_requires=emotion >= 0.0.1.007, python-evas >= 0.2.0
 group=System Environment/Libraries
 release=1
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-emotion/setup.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- setup.py	30 Sep 2007 22:43:10 -0000	1.6
+++ setup.py	1 Oct 2007 04:38:41 -0000	1.7
@@ -66,7 +66,7 @@
 
 
 setup(name='python-emotion',
-      version='0.1.1',
+      version='0.2.0',
       license='BSD',
       author='Gustavo Sverzut Barbieri',
       author_email='barbieri@...',
@@ -76,8 +76,8 @@
       keywords='wrapper binding enlightenment graphics raster evas canvas multimida playback xine gstreamer',
       classifiers=trove_classifiers,
       packages=find_packages(),
-      install_requires=['python-evas>=0.1.1'],
-      setup_requires=['python-evas>=0.1.1'],
+      install_requires=['python-evas>=0.2.0'],
+      setup_requires=['python-evas>=0.2.0'],
       ext_modules=[emotionmodule],
       zip_safe=False,
       cmdclass={'build_ext': emotion_build_ext,},

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-emotion/emotion


Modified Files:
	emotion.c_emotion.pyx 


Log Message:
Make python-emotion thread-safe.

 - acquiring/releasing GIL using 'with GIL' annotation
 - bumped version number

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-emotion/emotion/emotion.c_emotion.pyx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- emotion.c_emotion.pyx	30 Sep 2007 22:43:10 -0000	1.7
+++ emotion.c_emotion.pyx	1 Oct 2007 04:38:41 -0000	1.8
@@ -1,7 +1,8 @@
 cimport evas.c_evas as c_evas
 import evas.c_evas
 
-cdef void _emotion_callback(void *data, evas.c_evas.Evas_Object *o, void *ei):
+cdef void _emotion_callback(void *data,
+                            evas.c_evas.Evas_Object *o, void *ei) with GIL:
     cdef Emotion obj
     cdef object event
     obj = <Emotion>evas.c_evas._Object_from_instance(<long>o)

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas/include/evas


Modified Files:
	c_evas.pxd 


Log Message:
Adding metaclass to extension types to optimize register of decorated methods.

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/include/evas/c_evas.pxd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- c_evas.pxd	3 Oct 2007 04:44:24 -0000	1.2
+++ c_evas.pxd	8 Oct 2007 00:02:19 -0000	1.3
@@ -606,7 +606,6 @@
 
     cdef int _set_obj(self, Evas *obj) except 0
 
-
 cdef public class Object [object PyEvasObject, type PyEvasObject_Type]:
     cdef Evas_Object *obj
     cdef readonly Canvas evas
@@ -617,7 +616,8 @@
     cdef int _set_obj(self, Evas_Object *obj) except 0
 
 
-cdef class SmartObject(Object):
+cdef public class SmartObject(Object) [object PyEvasSmartObject,
+                                       type PyEvasSmartObject_Type]:
     cdef object _smart_callbacks
     cdef object _m_delete
     cdef object _m_move
@@ -629,33 +629,38 @@
     cdef object _m_clip_unset
 
 
-cdef class Rectangle(Object):
+cdef public class Rectangle(Object) [object PyEvasRectangle,
+                                     type PyEvasRectangle_Type]:
     pass
 
 
-cdef class Line(Object):
+cdef public class Line(Object) [object PyEvasLine, type PyEvasLine_Type]:
     pass
 
 
-cdef class Image(Object):
+cdef public class Image(Object) [object PyEvasImage, type PyEvasImage_Type]:
     pass
 
 
-cdef class FilledImage(Image):
+cdef public class FilledImage(Image) [object PyEvasFilledImage,
+                                      type PyEvasFilledImage_Type]:
     pass
 
 
-cdef class Gradient(Object):
+cdef public class Gradient(Object) [object PyEvasGradient,
+                                    type PyEvasGradient_Type]:
     pass
 
 
-cdef class Polygon(Object):
+cdef public class Polygon(Object) [object PyEvasPolygon,
+                                   type PyEvasPolygon_Type]:
     pass
 
 
-cdef class Text(Object):
+cdef public class Text(Object) [object PyEvasText, type PyEvasText_Type]:
     pass
 
 
-cdef class ClippedSmartObject(SmartObject):
+cdef public class ClippedSmartObject(SmartObject) \
+         [object PyEvasClippedSmartObject, type PyEvasClippedSmartObject_Type]:
     cdef readonly Rectangle clipper

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas/include


Modified Files:
	python.pxd 


Log Message:
Adding metaclass to extension types to optimize register of decorated methods.

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/include/python.pxd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- python.pxd	30 Sep 2007 21:57:17 -0000	1.1
+++ python.pxd	8 Oct 2007 00:02:19 -0000	1.2
@@ -35,6 +35,9 @@
         Py_GT = 4
         Py_GE = 5
 
+    ctypedef struct PyTypeObject:
+        PyTypeObject *ob_type
+
     # unicodeobject.h
     object PyUnicode_Decode(char *s, Py_ssize_t size, char *encoding, char *errors)

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas/evas


Modified Files:
	evas.c_evas.pyx evas.c_evas_object.pxi 
	evas.c_evas_object_gradient.pxi evas.c_evas_object_image.pxi 
	evas.c_evas_object_line.pxi evas.c_evas_object_polygon.pxi 
	evas.c_evas_object_rectangle.pxi evas.c_evas_object_smart.pxi 
	evas.c_evas_object_text.pxi 


Log Message:
Adding metaclass to extension types to optimize register of decorated methods.

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas.pyx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- evas.c_evas.pyx	28 Sep 2007 18:06:26 -0000	1.11
+++ evas.c_evas.pyx	8 Oct 2007 00:02:18 -0000	1.12
@@ -281,6 +281,11 @@
         Exception.__init__(self, "%s (file=%s, key=%s)" % (msg, filename, key))
 
 
+cdef void _install_metaclass(python.PyTypeObject *ctype, object metaclass):
+    python.Py_INCREF(metaclass)
+    ctype.ob_type = <python.PyTypeObject*>metaclass
+
+
 include "evas.c_evas_rect.pxi"
 include "evas.c_evas_canvas.pxi"
 include "evas.c_evas_object_events.pxi"
@@ -293,3 +298,36 @@
 include "evas.c_evas_object_gradient.pxi"
 include "evas.c_evas_object_polygon.pxi"
 include "evas.c_evas_object_text.pxi"
+
+
+class EvasMeta(type):
+    def __init__(cls, name, bases, dict_):
+        type.__init__(cls, name, bases, dict_)
+        cls._fetch_evt_callbacks()
+
+    def _fetch_evt_callbacks(cls):
+        if "__evas_event_callbacks__" in cls.__dict__:
+            return
+
+        cls.__evas_event_callbacks__ = []
+        append = cls.__evas_event_callbacks__.append
+
+        for name in dir(cls):
+            val = getattr(cls, name)
+            if not callable(val) or not hasattr(val, "evas_event_callback"):
+                continue
+            evt = getattr(val, "evas_event_callback")
+            append((name, evt))
+
+
+# installing metaclass for all extension types
+_object_install_metaclass(EvasMeta)
+_smartobj_install_metaclass(EvasMeta)
+_clippedsmartobj_install_metaclass(EvasMeta)
+_rectangle_install_metaclass(EvasMeta)
+_line_install_metaclass(EvasMeta)
+_image_install_metaclass(EvasMeta)
+_filledimage_install_metaclass(EvasMeta)
+_gradient_install_metaclass(EvasMeta)
+_polygon_install_metaclass(EvasMeta)
+_text_install_metaclass(EvasMeta)
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object.pxi,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- evas.c_evas_object.pxi	3 Oct 2007 04:44:24 -0000	1.18
+++ evas.c_evas_object.pxi	8 Oct 2007 00:02:18 -0000	1.19
@@ -41,11 +41,12 @@
 
 
 cdef _register_decorated_callbacks(obj):
-    for attr_name in dir(obj):
+    if not hasattr(obj, "__evas_event_callbacks__"):
+        return
+
+    for attr_name, evt in obj.__evas_event_callbacks__:
         attr_value = getattr(obj, attr_name)
-        if callable(attr_value) and hasattr(attr_value, "evas_event_callback"):
-            t = getattr(attr_value, "evas_event_callback")
-            obj.event_callback_add(t, attr_value)
+        obj.event_callback_add(evt, attr_value)
 
 
 cdef _add_callback_to_list(Object obj, int type, func, args, kargs):
@@ -1195,3 +1196,10 @@
     property parent:
         def __get__(self):
             return self.parent_get()
+
+
+cdef extern from "Python.h":
+    cdef python.PyTypeObject PyEvasObject_Type # hack to install metaclass
+
+cdef void _object_install_metaclass(object metaclass):
+    _install_metaclass(&PyEvasObject_Type, metaclass)
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_gradient.pxi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas.c_evas_object_gradient.pxi	5 Oct 2007 18:37:52 -0000	1.4
+++ evas.c_evas_object_gradient.pxi	8 Oct 2007 00:02:18 -0000	1.5
@@ -1,6 +1,7 @@
 # This file is included verbatim by c_evas.pyx
 
-cdef class Gradient(Object):
+cdef public class Gradient(Object) [object PyEvasGradient,
+                                    type PyEvasGradient_Type]:
     "Rectangular area with gradient filling"
     def __init__(self, Canvas canvas not None, **kargs):
         Object.__init__(self, canvas)
@@ -220,3 +221,10 @@
 
         def __set__(self, float value):
             self.offset_set(value)
+
+
+cdef extern from "Python.h":
+    cdef python.PyTypeObject PyEvasGradient_Type # hack to install metaclass
+
+cdef void _gradient_install_metaclass(object metaclass):
+    _install_metaclass(&PyEvasGradient_Type, metaclass)
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_image.pxi,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas.c_evas_object_image.pxi	5 Oct 2007 18:37:52 -0000	1.8
+++ evas.c_evas_object_image.pxi	8 Oct 2007 00:02:18 -0000	1.9
@@ -1,6 +1,6 @@
 # This file is included verbatim by c_evas.pyx
 
-cdef class Image(Object):
+cdef public class Image(Object) [object PyEvasImage, type PyEvasImage_Type]:
     """Image from file or buffer.
 
     @note: if an image is resized it will B{tile} it's contents respecting
@@ -344,6 +344,12 @@
         evas_object_image_save(self.obj, filename, key, flags)
 
 
+cdef extern from "Python.h":
+    cdef python.PyTypeObject PyEvasImage_Type # hack to install metaclass
+
+cdef void _image_install_metaclass(object metaclass):
+    _install_metaclass(&PyEvasImage_Type, metaclass)
+
 
 cdef void _cb_on_filled_image_resize(void *data, Evas *e,
                                      Evas_Object *obj,
@@ -352,7 +358,8 @@
     evas_object_geometry_get(obj, NULL, NULL, &w, &h)
     evas_object_image_fill_set(obj, 0, 0, w, h)
 
-cdef class FilledImage(Image):
+cdef public class FilledImage(Image) [object PyEvasFilledImage,
+                                      type PyEvasFilledImage_Type]:
     """Image that automatically resize it's contents to fit object size.
 
     This L{Image} subclass already calls L{Image.fill_set()} on resize so
@@ -367,3 +374,9 @@
         "Not available for this class."
         raise NotImplementedError("FilledImage doesn't support fill_set()")
 
+
+cdef extern from "Python.h":
+    cdef python.PyTypeObject PyEvasFilledImage_Type # hack to install metaclass
+
+cdef void _filledimage_install_metaclass(object metaclass):
+    _install_metaclass(&PyEvasFilledImage_Type, metaclass)
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_line.pxi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas.c_evas_object_line.pxi	28 Sep 2007 18:06:26 -0000	1.4
+++ evas.c_evas_object_line.pxi	8 Oct 2007 00:02:18 -0000	1.5
@@ -1,6 +1,6 @@
 # This file is included verbatim by c_evas.pyx
 
-cdef class Line(Object):
+cdef public class Line(Object) [object PyEvasLine, type PyEvasLine_Type]:
     "Straight line."
     def __init__(self, Canvas canvas not None, **kargs):
         Object.__init__(self, canvas)
@@ -117,3 +117,9 @@
             evas_object_line_xy_get(self.obj, NULL, NULL, &x2, &y2)
             return (x2, y2)
 
+
+cdef extern from "Python.h":
+    cdef python.PyTypeObject PyEvasLine_Type # hack to install metaclass
+
+cdef void _line_install_metaclass(object metaclass):
+    _install_metaclass(&PyEvasLine_Type, metaclass)
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_polygon.pxi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas.c_evas_object_polygon.pxi	28 Sep 2007 18:06:26 -0000	1.3
+++ evas.c_evas_object_polygon.pxi	8 Oct 2007 00:02:18 -0000	1.4
@@ -1,6 +1,7 @@
 # This file is included verbatim by c_evas.pyx
 
-cdef class Polygon(Object):
+cdef public class Polygon(Object) [object PyEvasPolygon,
+                                   type PyEvasPolygon_Type]:
     def __init__(self, Canvas canvas not None, **kargs):
         Object.__init__(self, canvas)
         if self.obj == NULL:
@@ -22,3 +23,10 @@
 
     def points_clear(self):
         evas_object_polygon_points_clear(self.obj)
+
+
+cdef extern from "Python.h":
+    cdef python.PyTypeObject PyEvasPolygon_Type # hack to install metaclass
+
+cdef void _polygon_install_metaclass(object metaclass):
+    _install_metaclass(&PyEvasPolygon_Type, metaclass)
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_rectangle.pxi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas.c_evas_object_rectangle.pxi	28 Sep 2007 18:06:26 -0000	1.3
+++ evas.c_evas_object_rectangle.pxi	8 Oct 2007 00:02:18 -0000	1.4
@@ -1,8 +1,16 @@
 # This file is included verbatim by c_evas.pyx
 
-cdef class Rectangle(Object):
+cdef public class Rectangle(Object) [object PyEvasRectangle,
+                                     type PyEvasRectangle_Type]:
     def __init__(self, Canvas canvas not None, **kargs):
         Object.__init__(self, canvas)
         if self.obj == NULL:
             self._set_obj(evas_object_rectangle_add(self.evas.obj))
         self._set_common_params(**kargs)
+
+
+cdef extern from "Python.h":
+    cdef python.PyTypeObject PyEvasRectangle_Type # hack to install metaclass
+
+cdef void _rectangle_install_metaclass(object metaclass):
+    _install_metaclass(&PyEvasRectangle_Type, metaclass)
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_smart.pxi,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- evas.c_evas_object_smart.pxi	2 Oct 2007 19:44:16 -0000	1.19
+++ evas.c_evas_object_smart.pxi	8 Oct 2007 00:02:18 -0000	1.20
@@ -203,7 +203,8 @@
         return meth
 
 
-cdef class SmartObject(Object):
+cdef public class SmartObject(Object) [object PyEvasSmartObject,
+                                       type PyEvasSmartObject_Type]:
     """Smart Evas Objects.
 
     Smart objects are user-defined Evas components, often used to group
@@ -522,8 +523,15 @@
         return obj
 
 
+cdef extern from "Python.h":
+    cdef python.PyTypeObject PyEvasSmartObject_Type # hack to install metaclass
 
-cdef class ClippedSmartObject(SmartObject):
+cdef void _smartobj_install_metaclass(object metaclass):
+    _install_metaclass(&PyEvasSmartObject_Type, metaclass)
+
+
+cdef public class ClippedSmartObject(SmartObject) \
+         [object PyEvasClippedSmartObject, type PyEvasClippedSmartObject_Type]:
     """SmartObject subclass that automatically handles an internal clipper.
 
     This class is optimized for the recommended SmartObject usage of
@@ -589,3 +597,10 @@
     def clip_unset(self):
         "Default implementation that acts on the the clipper."
         evas_object_clip_unset(self.clipper.obj)
+
+
+cdef extern from "Python.h":
+    cdef python.PyTypeObject PyEvasClippedSmartObject_Type # hack to install metaclass
+
+cdef void _clippedsmartobj_install_metaclass(object metaclass):
+    _install_metaclass(&PyEvasClippedSmartObject_Type, metaclass)
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_text.pxi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas.c_evas_object_text.pxi	28 Sep 2007 18:06:26 -0000	1.4
+++ evas.c_evas_object_text.pxi	8 Oct 2007 00:02:18 -0000	1.5
@@ -1,6 +1,6 @@
 # This file is included verbatim by c_evas.pyx
 
-cdef class Text(Object):
+cdef public class Text(Object) [object PyEvasText, type PyEvasText_Type]:
     """Text object.
 
     @group Font settings: font_source_set, font_source_get, font_source,
@@ -331,3 +331,9 @@
         def __get__(self):
             return self.style_pad_get()
 
+
+cdef extern from "Python.h":
+    cdef python.PyTypeObject PyEvasText_Type # hack to install metaclass
+
+cdef void _text_install_metaclass(object metaclass):
+    _install_metaclass(&PyEvasText_Type, metaclass)

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-edje/include/edje


Modified Files:
	c_edje.pxd 


Log Message:
Adding metaclass to extension types to optimize register of decorated methods.

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-edje/include/edje/c_edje.pxd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- c_edje.pxd	30 Sep 2007 22:35:31 -0000	1.1
+++ c_edje.pxd	8 Oct 2007 00:04:08 -0000	1.2
@@ -237,7 +237,7 @@
     cdef Edje_Message_String_Float_Set *obj
 
 
-cdef class Edje(evas.c_evas.Object):
+cdef public class Edje(evas.c_evas.Object) [object PyEdje, type PyEdje_Type]:
     cdef object _text_change_cb
     cdef object _message_handler_cb
     cdef object _signal_callbacks

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-edje/edje


Modified Files:
	edje.c_edje.pyx edje.c_edje_object.pxi 


Log Message:
Adding metaclass to extension types to optimize register of decorated methods.

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-edje/edje/edje.c_edje.pyx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- edje.c_edje.pyx	1 Oct 2007 06:34:28 -0000	1.6
+++ edje.c_edje.pyx	8 Oct 2007 00:04:08 -0000	1.7
@@ -230,5 +230,45 @@
     edje_extern_object_aspect_set(obj.obj, <Edje_Aspect_Control>aspect, w, h)
 
 
+cdef void _install_metaclass(python.PyTypeObject *ctype, object metaclass):
+    python.Py_INCREF(metaclass)
+    ctype.ob_type = <python.PyTypeObject*>metaclass
+
+
 include "edje.c_edje_message.pxi"
 include "edje.c_edje_object.pxi"
+
+
+class EdjeMeta(evas.c_evas.EvasMeta):
+    def __init__(cls, name, bases, dict_):
+        evas.c_evas.EvasMeta.__init__(cls, name, bases, dict_)
+        cls._fetch_callbacks()
+
+    def _fetch_callbacks(cls):
+        if "__edje_signal_callbacks__" in cls.__dict__:
+            return
+
+        cls.__edje_signal_callbacks__ = []
+        cls.__edje_message_callbacks__ = []
+        cls.__edje_text_callbacks__ = []
+
+        sig_append = cls.__edje_signal_callbacks__.append
+        msg_append = cls.__edje_message_callbacks__.append
+        txt_append = cls.__edje_text_callbacks__.append
+
+        for name in dir(cls):
+            val = getattr(cls, name)
+            if not callable(val):
+                continue
+
+            if hasattr(val, "edje_signal_callback"):
+                sig_data = getattr(val, "edje_signal_callback")
+                sig_append((name, sig_data))
+            elif hasattr(val, "edje_message_handler"):
+                msg_append(name)
+            elif hasattr(val, "edje_text_change_callback"):
+                txt_append(name)
+
+
+# installing metaclass for all extension types
+_edje_install_metaclass(EdjeMeta)
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-edje/edje/edje.c_edje_object.pxi,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- edje.c_edje_object.pxi	1 Oct 2007 06:34:28 -0000	1.20
+++ edje.c_edje_object.pxi	8 Oct 2007 00:04:08 -0000	1.21
@@ -45,16 +45,20 @@
 
 
 cdef _register_decorated_callbacks(obj):
-    for attr_name in dir(obj):
+    if not hasattr(obj, "__edje_signal_callbacks__"):
+        return
+
+    for attr_name, sig_data in obj.__edje_signal_callbacks__:
+        attr_value = getattr(obj, attr_name)
+        obj.signal_callback_add(sig_data[0], sig_data[1], attr_value)
+
+    for attr_name in obj.__edje_message_callbacks__:
+        attr_value = getattr(obj, attr_name)
+        obj.message_handler_set(attr_value)
+
+    for attr_name in obj.__edje_text_callbacks__:
         attr_value = getattr(obj, attr_name)
-        if callable(attr_value):
-            if hasattr(attr_value, "edje_signal_callback"):
-                emission, source = getattr(attr_value, "edje_signal_callback")
-                obj.signal_callback_add(emission, source, attr_value)
-            elif hasattr(attr_value, "edje_text_change_callback"):
-                obj.text_change_cb_set(attr_value)
-            elif hasattr(attr_value, "edje_message_handler"):
-                obj.message_handler_set(attr_value)
+        obj.text_change_cb_set(attr_value)
 
 
 class EdjeLoadError(Exception):
@@ -85,7 +89,7 @@
         Exception.__init__(self, "%s (file=%r, group=%r)" % (msg, file, group))
 
 
-cdef class Edje(evas.c_evas.Object):
+cdef public class Edje(evas.c_evas.Object) [object PyEdje, type PyEdje_Type]:
     """Edje evas object.
 
     This is a high level L{evas.SmartObject} that is defined as a group of
@@ -724,3 +728,10 @@
 
 
 evas.c_evas._object_mapping_register("edje", Edje)
+
+
+cdef extern from "Python.h":
+    cdef python.PyTypeObject PyEdje_Type # hack to install metaclass
+
+cdef void _edje_install_metaclass(object metaclass):
+    _install_metaclass(&PyEdje_Type, metaclass)

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas/evas


Modified Files:
	evas.c_evas.pyx evas.c_evas_object.pxi 
	evas.c_evas_object_gradient.pxi evas.c_evas_object_image.pxi 
	evas.c_evas_object_line.pxi evas.c_evas_object_polygon.pxi 
	evas.c_evas_object_rectangle.pxi evas.c_evas_object_smart.pxi 
	evas.c_evas_object_text.pxi 


Log Message:
More metaclass work.

 - changed EvasMeta to EvasObjectMeta to better describe it
 - removed specific functions to install metaclass (we just need one)
 - added metaclass for smart objects to optimize the lookup of Evas_Smart

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas.pyx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- evas.c_evas.pyx	8 Oct 2007 00:02:18 -0000	1.12
+++ evas.c_evas.pyx	8 Oct 2007 15:09:01 -0000	1.13
@@ -286,21 +286,7 @@
     ctype.ob_type = <python.PyTypeObject*>metaclass
 
 
-include "evas.c_evas_rect.pxi"
-include "evas.c_evas_canvas.pxi"
-include "evas.c_evas_object_events.pxi"
-include "evas.c_evas_object_callbacks.pxi"
-include "evas.c_evas_object.pxi"
-include "evas.c_evas_object_smart.pxi"
-include "evas.c_evas_object_rectangle.pxi"
-include "evas.c_evas_object_line.pxi"
-include "evas.c_evas_object_image.pxi"
-include "evas.c_evas_object_gradient.pxi"
-include "evas.c_evas_object_polygon.pxi"
-include "evas.c_evas_object_text.pxi"
-
-
-class EvasMeta(type):
+class EvasObjectMeta(type):
     def __init__(cls, name, bases, dict_):
         type.__init__(cls, name, bases, dict_)
         cls._fetch_evt_callbacks()
@@ -320,14 +306,15 @@
             append((name, evt))
 
 
-# installing metaclass for all extension types
-_object_install_metaclass(EvasMeta)
-_smartobj_install_metaclass(EvasMeta)
-_clippedsmartobj_install_metaclass(EvasMeta)
-_rectangle_install_metaclass(EvasMeta)
-_line_install_metaclass(EvasMeta)
-_image_install_metaclass(EvasMeta)
-_filledimage_install_metaclass(EvasMeta)
-_gradient_install_metaclass(EvasMeta)
-_polygon_install_metaclass(EvasMeta)
-_text_install_metaclass(EvasMeta)
+include "evas.c_evas_rect.pxi"
+include "evas.c_evas_canvas.pxi"
+include "evas.c_evas_object_events.pxi"
+include "evas.c_evas_object_callbacks.pxi"
+include "evas.c_evas_object.pxi"
+include "evas.c_evas_object_smart.pxi"
+include "evas.c_evas_object_rectangle.pxi"
+include "evas.c_evas_object_line.pxi"
+include "evas.c_evas_object_image.pxi"
+include "evas.c_evas_object_gradient.pxi"
+include "evas.c_evas_object_polygon.pxi"
+include "evas.c_evas_object_text.pxi"
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object.pxi,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- evas.c_evas_object.pxi	8 Oct 2007 00:02:18 -0000	1.19
+++ evas.c_evas_object.pxi	8 Oct 2007 15:09:01 -0000	1.20
@@ -1201,5 +1201,4 @@
 cdef extern from "Python.h":
     cdef python.PyTypeObject PyEvasObject_Type # hack to install metaclass
 
-cdef void _object_install_metaclass(object metaclass):
-    _install_metaclass(&PyEvasObject_Type, metaclass)
+_install_metaclass(&PyEvasObject_Type, EvasObjectMeta)
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_gradient.pxi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas.c_evas_object_gradient.pxi	8 Oct 2007 00:02:18 -0000	1.5
+++ evas.c_evas_object_gradient.pxi	8 Oct 2007 15:09:01 -0000	1.6
@@ -226,5 +226,4 @@
 cdef extern from "Python.h":
     cdef python.PyTypeObject PyEvasGradient_Type # hack to install metaclass
 
-cdef void _gradient_install_metaclass(object metaclass):
-    _install_metaclass(&PyEvasGradient_Type, metaclass)
+_install_metaclass(&PyEvasGradient_Type, EvasObjectMeta)
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_image.pxi,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- evas.c_evas_object_image.pxi	8 Oct 2007 00:02:18 -0000	1.9
+++ evas.c_evas_object_image.pxi	8 Oct 2007 15:09:01 -0000	1.10
@@ -347,8 +347,7 @@
 cdef extern from "Python.h":
     cdef python.PyTypeObject PyEvasImage_Type # hack to install metaclass
 
-cdef void _image_install_metaclass(object metaclass):
-    _install_metaclass(&PyEvasImage_Type, metaclass)
+_install_metaclass(&PyEvasImage_Type, EvasObjectMeta)
 
 
 cdef void _cb_on_filled_image_resize(void *data, Evas *e,
@@ -378,5 +377,4 @@
 cdef extern from "Python.h":
     cdef python.PyTypeObject PyEvasFilledImage_Type # hack to install metaclass
 
-cdef void _filledimage_install_metaclass(object metaclass):
-    _install_metaclass(&PyEvasFilledImage_Type, metaclass)
+_install_metaclass(&PyEvasFilledImage_Type, EvasObjectMeta)
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_line.pxi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas.c_evas_object_line.pxi	8 Oct 2007 00:02:18 -0000	1.5
+++ evas.c_evas_object_line.pxi	8 Oct 2007 15:09:01 -0000	1.6
@@ -121,5 +121,4 @@
 cdef extern from "Python.h":
     cdef python.PyTypeObject PyEvasLine_Type # hack to install metaclass
 
-cdef void _line_install_metaclass(object metaclass):
-    _install_metaclass(&PyEvasLine_Type, metaclass)
+_install_metaclass(&PyEvasLine_Type, EvasObjectMeta)
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_polygon.pxi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas.c_evas_object_polygon.pxi	8 Oct 2007 00:02:18 -0000	1.4
+++ evas.c_evas_object_polygon.pxi	8 Oct 2007 15:09:01 -0000	1.5
@@ -28,5 +28,4 @@
 cdef extern from "Python.h":
     cdef python.PyTypeObject PyEvasPolygon_Type # hack to install metaclass
 
-cdef void _polygon_install_metaclass(object metaclass):
-    _install_metaclass(&PyEvasPolygon_Type, metaclass)
+_install_metaclass(&PyEvasPolygon_Type, EvasObjectMeta)
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_rectangle.pxi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas.c_evas_object_rectangle.pxi	8 Oct 2007 00:02:18 -0000	1.4
+++ evas.c_evas_object_rectangle.pxi	8 Oct 2007 15:09:01 -0000	1.5
@@ -12,5 +12,4 @@
 cdef extern from "Python.h":
     cdef python.PyTypeObject PyEvasRectangle_Type # hack to install metaclass
 
-cdef void _rectangle_install_metaclass(object metaclass):
-    _install_metaclass(&PyEvasRectangle_Type, metaclass)
+_install_metaclass(&PyEvasRectangle_Type, EvasObjectMeta)
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_smart.pxi,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- evas.c_evas_object_smart.pxi	8 Oct 2007 00:02:18 -0000	1.20
+++ evas.c_evas_object_smart.pxi	8 Oct 2007 15:09:01 -0000	1.21
@@ -1,7 +1,5 @@
 # This file is included verbatim by c_evas.pyx
 
-cdef object _smart_objects
-_smart_objects = dict()
 cdef object _smart_classes
 _smart_classes = list()
 
@@ -180,18 +178,18 @@
     return <long>cls
 
 
-cdef Evas_Smart *_smart_class_from_name(char *name) except NULL:
-    cdef long addr
-    key = name
-    # XXX: for optimizations this should be a try-except KeyError,
-    # XXX: but it just don't work, I'm getting non-released objects
-    # XXX: due pending references (Pyrex 0.9.5.1a).
-    if key in _smart_objects:
-        addr = _smart_objects[key]
-    else:
-        addr = _smart_object_class_new(name)
-        _smart_objects[key] = addr
-    return <Evas_Smart*>addr
+class EvasSmartObjectMeta(EvasObjectMeta):
+    def __init__(cls, name, bases, dict_):
+        EvasObjectMeta.__init__(cls, name, bases, dict_)
+        cls._setup_smart_class()
+
+    def _setup_smart_class(cls):
+        if "__evas_smart_class__" in cls.__dict__:
+            return
+
+        cdef long addr
+        addr = _smart_object_class_new(cls.__name__)
+        cls.__evas_smart_class__ = addr
 
 
 cdef object _smart_class_get_impl_method(object cls, char *name):
@@ -296,13 +294,14 @@
         self._smart_callbacks = None
 
     def __init__(self, Canvas canvas not None, **kargs):
-        cdef Evas_Smart *cls
+        cdef long addr
         if type(self) is SmartObject:
             raise TypeError("Must not instantiate SmartObject, but subclasses")
         Object.__init__(self, canvas)
         if self.obj == NULL:
-            cls = _smart_class_from_name(self.__class__.__name__)
-            self._set_obj(evas_object_smart_add(self.evas.obj, cls))
+            addr = self.__evas_smart_class__
+            self._set_obj(evas_object_smart_add(self.evas.obj,
+                                                <Evas_Smart*>addr))
         self._set_common_params(**kargs)
 
     def member_add(self, Object child):
@@ -526,8 +525,7 @@
 cdef extern from "Python.h":
     cdef python.PyTypeObject PyEvasSmartObject_Type # hack to install metaclass
 
-cdef void _smartobj_install_metaclass(object metaclass):
-    _install_metaclass(&PyEvasSmartObject_Type, metaclass)
+_install_metaclass(&PyEvasSmartObject_Type, EvasSmartObjectMeta)
 
 
 cdef public class ClippedSmartObject(SmartObject) \
@@ -602,5 +600,4 @@
 cdef extern from "Python.h":
     cdef python.PyTypeObject PyEvasClippedSmartObject_Type # hack to install metaclass
 
-cdef void _clippedsmartobj_install_metaclass(object metaclass):
-    _install_metaclass(&PyEvasClippedSmartObject_Type, metaclass)
+_install_metaclass(&PyEvasClippedSmartObject_Type, EvasSmartObjectMeta)
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_text.pxi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas.c_evas_object_text.pxi	8 Oct 2007 00:02:18 -0000	1.5
+++ evas.c_evas_object_text.pxi	8 Oct 2007 15:09:01 -0000	1.6
@@ -335,5 +335,4 @@
 cdef extern from "Python.h":
     cdef python.PyTypeObject PyEvasText_Type # hack to install metaclass
 
-cdef void _text_install_metaclass(object metaclass):
-    _install_metaclass(&PyEvasText_Type, metaclass)
+_install_metaclass(&PyEvasText_Type, EvasObjectMeta)

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-edje/edje


Modified Files:
	edje.c_edje.pyx edje.c_edje_object.pxi 


Log Message:
More metaclass work.

 - changed EdjeMeta to EdjeObjectMeta and moved to edje object's .pxi
 - fixed EdjeObjectMeta to inherit from EvasObjectMeta (and not EvasMeta)
 - removed specific function to install metaclass (we just need one)

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-edje/edje/edje.c_edje.pyx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- edje.c_edje.pyx	8 Oct 2007 00:04:08 -0000	1.7
+++ edje.c_edje.pyx	8 Oct 2007 15:15:58 -0000	1.8
@@ -237,38 +237,3 @@
 
 include "edje.c_edje_message.pxi"
 include "edje.c_edje_object.pxi"
-
-
-class EdjeMeta(evas.c_evas.EvasMeta):
-    def __init__(cls, name, bases, dict_):
-        evas.c_evas.EvasMeta.__init__(cls, name, bases, dict_)
-        cls._fetch_callbacks()
-
-    def _fetch_callbacks(cls):
-        if "__edje_signal_callbacks__" in cls.__dict__:
-            return
-
-        cls.__edje_signal_callbacks__ = []
-        cls.__edje_message_callbacks__ = []
-        cls.__edje_text_callbacks__ = []
-
-        sig_append = cls.__edje_signal_callbacks__.append
-        msg_append = cls.__edje_message_callbacks__.append
-        txt_append = cls.__edje_text_callbacks__.append
-
-        for name in dir(cls):
-            val = getattr(cls, name)
-            if not callable(val):
-                continue
-
-            if hasattr(val, "edje_signal_callback"):
-                sig_data = getattr(val, "edje_signal_callback")
-                sig_append((name, sig_data))
-            elif hasattr(val, "edje_message_handler"):
-                msg_append(name)
-            elif hasattr(val, "edje_text_change_callback"):
-                txt_append(name)
-
-
-# installing metaclass for all extension types
-_edje_install_metaclass(EdjeMeta)
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-edje/edje/edje.c_edje_object.pxi,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- edje.c_edje_object.pxi	8 Oct 2007 00:04:08 -0000	1.21
+++ edje.c_edje_object.pxi	8 Oct 2007 15:15:58 -0000	1.22
@@ -727,11 +727,41 @@
         edje_object_signal_emit(self.obj, emission, source)
 
 
-evas.c_evas._object_mapping_register("edje", Edje)
+class EdjeObjectMeta(evas.c_evas.EvasObjectMeta):
+    def __init__(cls, name, bases, dict_):
+        evas.c_evas.EvasObjectMeta.__init__(cls, name, bases, dict_)
+        cls._fetch_callbacks()
+
+    def _fetch_callbacks(cls):
+        if "__edje_signal_callbacks__" in cls.__dict__:
+            return
+
+        cls.__edje_signal_callbacks__ = []
+        cls.__edje_message_callbacks__ = []
+        cls.__edje_text_callbacks__ = []
+
+        sig_append = cls.__edje_signal_callbacks__.append
+        msg_append = cls.__edje_message_callbacks__.append
+        txt_append = cls.__edje_text_callbacks__.append
+
+        for name in dir(cls):
+            val = getattr(cls, name)
+            if not callable(val):
+                continue
+
+            if hasattr(val, "edje_signal_callback"):
+                sig_data = getattr(val, "edje_signal_callback")
+                sig_append((name, sig_data))
+            elif hasattr(val, "edje_message_handler"):
+                msg_append(name)
+            elif hasattr(val, "edje_text_change_callback"):
+                txt_append(name)
 
 
 cdef extern from "Python.h":
     cdef python.PyTypeObject PyEdje_Type # hack to install metaclass
 
-cdef void _edje_install_metaclass(object metaclass):
-    _install_metaclass(&PyEdje_Type, metaclass)
+_install_metaclass(&PyEdje_Type, EdjeObjectMeta)
+
+
+evas.c_evas._object_mapping_register("edje", Edje)

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-edje/edje


Modified Files:
	edje.c_edje_object.pxi 


Log Message:
Testing for basestring instance to support all string types.

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-edje/edje/edje.c_edje_object.pxi,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- edje.c_edje_object.pxi	8 Oct 2007 15:15:58 -0000	1.22
+++ edje.c_edje_object.pxi	20 Oct 2007 22:19:34 -0000	1.23
@@ -653,10 +653,9 @@
                 self.message_send(id, data[0])
                 return
 
-            item_type = type(data[0])
-            if item_type not in (long, int, float, str): # FIXME: add unicode
+            if not isinstance(data[0], (long, int, float, basestring)):
                 raise TypeError("invalid message list type '%s'" %
-                                item_type.__name__)
+                                type(data[0]).__name__)
 
             self.message_send_set(id, data)
         else:

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas/evas


Modified Files:
	evas.c_evas_object.pxi evas.c_evas_object_callbacks.pxi 
	evas.c_evas_object_image.pxi evas.c_evas_object_smart.pxi 


Log Message:
Updating to use newer Cython (0.9.6.8).

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object.pxi,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- evas.c_evas_object.pxi	18 Oct 2007 14:55:36 -0000	1.21
+++ evas.c_evas_object.pxi	5 Nov 2007 21:47:48 -0000	1.22
@@ -25,7 +25,7 @@
 
 
 cdef void obj_free_cb(void *data, Evas *e,
-                      Evas_Object *obj, void *event_info) with GIL:
+                      Evas_Object *obj, void *event_info) with gil:
     cdef Object self
     self = <Object>data
 
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_callbacks.pxi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas.c_evas_object_callbacks.pxi	3 Oct 2007 04:44:24 -0000	1.5
+++ evas.c_evas_object_callbacks.pxi	5 Nov 2007 21:47:48 -0000	1.6
@@ -25,7 +25,7 @@
 
 
 cdef void cb_mouse_in(void *data, Evas *e,
-                      Evas_Object *obj, void *e_inf) with GIL:
+                      Evas_Object *obj, void *e_inf) with gil:
     cdef EventMouseIn event
     event = EventMouseIn()
     event._set_obj(e_inf)
@@ -33,7 +33,7 @@
 
 
 cdef void cb_mouse_out(void *data, Evas *e,
-                       Evas_Object *obj, void *e_inf) with GIL:
+                       Evas_Object *obj, void *e_inf) with gil:
     cdef EventMouseOut event
     event = EventMouseOut()
     event._set_obj(e_inf)
@@ -41,7 +41,7 @@
 
 
 cdef void cb_mouse_down(void *data, Evas *e,
-                        Evas_Object *obj, void *e_inf) with GIL:
+                        Evas_Object *obj, void *e_inf) with gil:
     cdef EventMouseDown event
     event = EventMouseDown()
     event._set_obj(e_inf)
@@ -49,7 +49,7 @@
 
 
 cdef void cb_mouse_up(void *data, Evas *e,
-                      Evas_Object *obj, void *e_inf) with GIL:
+                      Evas_Object *obj, void *e_inf) with gil:
     cdef EventMouseUp event
     event = EventMouseUp()
     event._set_obj(e_inf)
@@ -57,7 +57,7 @@
 
 
 cdef void cb_mouse_move(void *data, Evas *e,
-                        Evas_Object *obj, void *e_inf) with GIL:
+                        Evas_Object *obj, void *e_inf) with gil:
     cdef EventMouseMove event
     event = EventMouseMove()
     event._set_obj(e_inf)
@@ -65,7 +65,7 @@
 
 
 cdef void cb_mouse_wheel(void *data, Evas *e,
-                         Evas_Object *obj, void *e_inf) with GIL:
+                         Evas_Object *obj, void *e_inf) with gil:
     cdef EventMouseWheel event
     event = EventMouseWheel()
     event._set_obj(e_inf)
@@ -73,12 +73,12 @@
 
 
 cdef void cb_free(void *data, Evas *e,
-                  Evas_Object *obj, void *e_inf) with GIL:
+                  Evas_Object *obj, void *e_inf) with gil:
     cb_dispatcher2(<Object>data, EVAS_CALLBACK_FREE)
 
 
 cdef void cb_key_down(void *data, Evas *e,
-                      Evas_Object *obj, void *e_inf) with GIL:
+                      Evas_Object *obj, void *e_inf) with gil:
     cdef EventKeyDown event
     event = EventKeyDown()
     event._set_obj(e_inf)
@@ -86,7 +86,7 @@
 
 
 cdef void cb_key_up(void *data, Evas *e,
-                    Evas_Object *obj, void *e_inf) with GIL:
+                    Evas_Object *obj, void *e_inf) with gil:
     cdef EventKeyUp event
     event = EventKeyUp()
     event._set_obj(e_inf)
@@ -94,39 +94,39 @@
 
 
 cdef void cb_focus_in(void *data, Evas *e,
-                      Evas_Object *obj, void *e_inf) with GIL:
+                      Evas_Object *obj, void *e_inf) with gil:
     cb_dispatcher2(<Object>data, EVAS_CALLBACK_FOCUS_IN)
 
 
 cdef void cb_focus_out(void *data, Evas *e,
-                       Evas_Object *obj, void *e_inf) with GIL:
+                       Evas_Object *obj, void *e_inf) with gil:
     cb_dispatcher2(<Object>data, EVAS_CALLBACK_FOCUS_OUT)
 
 
-cdef void cb_show(void *data, Evas *e, Evas_Object *obj, void *e_inf) with GIL:
+cdef void cb_show(void *data, Evas *e, Evas_Object *obj, void *e_inf) with gil:
     cb_dispatcher2(<Object>data, EVAS_CALLBACK_SHOW)
 
 
-cdef void cb_hide(void *data, Evas *e, Evas_Object *obj, void *e_inf) with GIL:
+cdef void cb_hide(void *data, Evas *e, Evas_Object *obj, void *e_inf) with gil:
     cb_dispatcher2(<Object>data, EVAS_CALLBACK_HIDE)
 
 
-cdef void cb_move(void *data, Evas *e, Evas_Object *obj, void *e_inf) with GIL:
+cdef void cb_move(void *data, Evas *e, Evas_Object *obj, void *e_inf) with gil:
     cb_dispatcher2(<Object>data, EVAS_CALLBACK_MOVE)
 
 
 cdef void cb_resize(void *data, Evas *e,
-                    Evas_Object *obj, void *e_inf) with GIL:
+                    Evas_Object *obj, void *e_inf) with gil:
     cb_dispatcher2(<Object>data, EVAS_CALLBACK_RESIZE)
 
 
 cdef void cb_restack(void *data, Evas *e,
-                     Evas_Object *obj, void *e_inf) with GIL:
+                     Evas_Object *obj, void *e_inf) with gil:
     cb_dispatcher2(<Object>data, EVAS_CALLBACK_RESTACK)
 
 
 cdef void cb_del(void *data, Evas *e,
-                 Evas_Object *obj, void *e_inf) with GIL:
+                 Evas_Object *obj, void *e_inf) with gil:
     cb_dispatcher2(<Object>data, EVAS_CALLBACK_DEL)
 
 
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_image.pxi,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- evas.c_evas_object_image.pxi	21 Oct 2007 00:51:02 -0000	1.11
+++ evas.c_evas_object_image.pxi	5 Nov 2007 21:47:48 -0000	1.12
@@ -545,7 +545,7 @@
 
 cdef void _cb_on_filled_image_resize(void *data, Evas *e,
                                      Evas_Object *obj,
-                                     void *event_info) with GIL:
+                                     void *event_info) with gil:
     cdef int w, h
     evas_object_geometry_get(obj, NULL, NULL, &w, &h)
     evas_object_image_fill_set(obj, 0, 0, w, h)
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_smart.pxi,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- evas.c_evas_object_smart.pxi	29 Oct 2007 21:07:37 -0000	1.22
+++ evas.c_evas_object_smart.pxi	5 Nov 2007 21:47:48 -0000	1.23
@@ -5,7 +5,7 @@
 
 import traceback
 
-cdef void _smart_object_delete(Evas_Object *o) with GIL:
+cdef void _smart_object_delete(Evas_Object *o) with gil:
     cdef SmartObject obj
     obj = <SmartObject>evas_object_data_get(o, "python-evas")
 
@@ -59,7 +59,7 @@
 
 
 cdef void _smart_object_move(Evas_Object *o,
-                             Evas_Coord x, Evas_Coord y) with GIL:
+                             Evas_Coord x, Evas_Coord y) with gil:
     cdef SmartObject obj
     obj = <SmartObject>evas_object_data_get(o, "python-evas")
     if obj._m_move is not None:
@@ -70,7 +70,7 @@
 
 
 cdef void _smart_object_resize(Evas_Object *o,
-                               Evas_Coord w, Evas_Coord h) with GIL:
+                               Evas_Coord w, Evas_Coord h) with gil:
     cdef SmartObject obj
     obj = <SmartObject>evas_object_data_get(o, "python-evas")
     if obj._m_resize is not None:
@@ -80,7 +80,7 @@
             traceback.print_exc()
 
 
-cdef void _smart_object_show(Evas_Object *o) with GIL:
+cdef void _smart_object_show(Evas_Object *o) with gil:
     cdef SmartObject obj
     obj = <SmartObject>evas_object_data_get(o, "python-evas")
     if obj._m_show is not None:
@@ -90,7 +90,7 @@
             traceback.print_exc()
 
 
-cdef void _smart_object_hide(Evas_Object *o) with GIL:
+cdef void _smart_object_hide(Evas_Object *o) with gil:
     cdef SmartObject obj
     obj = <SmartObject>evas_object_data_get(o, "python-evas")
     if obj._m_hide is not None:
@@ -101,7 +101,7 @@
 
 
 cdef void _smart_object_color_set(Evas_Object *o,
-                                  int r, int g, int b, int a) with GIL:
+                                  int r, int g, int b, int a) with gil:
     cdef SmartObject obj
     obj = <SmartObject>evas_object_data_get(o, "python-evas")
     if obj._m_color_set is not None:
@@ -111,7 +111,7 @@
             traceback.print_exc()
 
 
-cdef void _smart_object_clip_set(Evas_Object *o, Evas_Object *clip) with GIL:
+cdef void _smart_object_clip_set(Evas_Object *o, Evas_Object *clip) with gil:
     cdef SmartObject obj
     cdef Object other
     obj = <SmartObject>evas_object_data_get(o, "python-evas")
@@ -123,7 +123,7 @@
             traceback.print_exc()
 
 
-cdef void _smart_object_clip_unset(Evas_Object *o) with GIL:
+cdef void _smart_object_clip_unset(Evas_Object *o) with gil:
     cdef SmartObject obj
     obj = <SmartObject>evas_object_data_get(o, "python-evas")
     if obj._m_clip_unset is not None:
@@ -134,7 +134,7 @@
 
 
 cdef void _smart_callback(void *data,
-                          Evas_Object *o, void *event_info) with GIL:
+                          Evas_Object *o, void *event_info) with gil:
     cdef SmartObject obj
     cdef object event, ei
     obj = <SmartObject>evas_object_data_get(o, "python-evas")

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas


Modified Files:
	README setup.py 


Log Message:
Updating to use newer Cython (0.9.6.8).

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- README	30 Sep 2007 21:57:17 -0000	1.4
+++ README	5 Nov 2007 21:47:48 -0000	1.5
@@ -4,7 +4,7 @@
 ============
 
  * Evas >= 0.9.9.040
- * Cython from Mercurial repository (http://www.cython.org/hg/)
+ * Cython >= 0.9.6.8
  * Python >= 2.4
  * Python-setuptools >= 0.6_rc3
 
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/setup.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- setup.py	4 Oct 2007 19:21:33 -0000	1.18
+++ setup.py	5 Nov 2007 21:47:48 -0000	1.19
@@ -94,6 +94,7 @@
     def finalize_options(self):
         build_ext.finalize_options(self)
         self.include_dirs.insert(0, 'include')
+        self.pyrex_include_dirs.extend(self.include_dirs)
 
 
 class evas_install_headers(install_headers):

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-ecore/ecore/evas


Modified Files:
	ecore.evas.c_ecore_evas_base.pxi 


Log Message:
Updating to use newer Cython (0.9.6.8).

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/evas/ecore.evas.c_ecore_evas_base.pxi,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ecore.evas.c_ecore_evas_base.pxi	3 Oct 2007 14:35:50 -0000	1.10
+++ ecore.evas.c_ecore_evas_base.pxi	5 Nov 2007 22:05:54 -0000	1.11
@@ -9,7 +9,7 @@
     assert data != NULL, "Ecore_Evas is not wrapped by Python object."
     return <EcoreEvas>data
 
-cdef void resize_cb(Ecore_Evas *ee) with GIL:
+cdef void resize_cb(Ecore_Evas *ee) with gil:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -17,7 +17,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void move_cb(Ecore_Evas *ee) with GIL:
+cdef void move_cb(Ecore_Evas *ee) with gil:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -25,7 +25,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void show_cb(Ecore_Evas *ee) with GIL:
+cdef void show_cb(Ecore_Evas *ee) with gil:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -33,7 +33,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void hide_cb(Ecore_Evas *ee) with GIL:
+cdef void hide_cb(Ecore_Evas *ee) with gil:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -41,7 +41,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void delete_request_cb(Ecore_Evas *ee) with GIL:
+cdef void delete_request_cb(Ecore_Evas *ee) with gil:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -49,7 +49,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void destroy_cb(Ecore_Evas *ee) with GIL:
+cdef void destroy_cb(Ecore_Evas *ee) with gil:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -57,7 +57,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void focus_in_cb(Ecore_Evas *ee) with GIL:
+cdef void focus_in_cb(Ecore_Evas *ee) with gil:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -65,7 +65,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void focus_out_cb(Ecore_Evas *ee) with GIL:
+cdef void focus_out_cb(Ecore_Evas *ee) with gil:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -73,7 +73,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void sticky_cb(Ecore_Evas *ee) with GIL:
+cdef void sticky_cb(Ecore_Evas *ee) with gil:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -81,7 +81,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void unsticky_cb(Ecore_Evas *ee) with GIL:
+cdef void unsticky_cb(Ecore_Evas *ee) with gil:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -89,7 +89,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void mouse_in_cb(Ecore_Evas *ee) with GIL:
+cdef void mouse_in_cb(Ecore_Evas *ee) with gil:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -97,7 +97,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void mouse_out_cb(Ecore_Evas *ee) with GIL:
+cdef void mouse_out_cb(Ecore_Evas *ee) with gil:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -105,7 +105,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void pre_render_cb(Ecore_Evas *ee) with GIL:
+cdef void pre_render_cb(Ecore_Evas *ee) with gil:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:
@@ -113,7 +113,7 @@
     except Exception, e:
         traceback.print_exc()
 
-cdef void post_render_cb(Ecore_Evas *ee) with GIL:
+cdef void post_render_cb(Ecore_Evas *ee) with gil:
     cdef EcoreEvas self
     self = EcoreEvas_from_instance(ee)
     try:

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-ecore/ecore


Modified Files:
	ecore.c_ecore_animator.pxi ecore.c_ecore_fd_handler.pxi 
	ecore.c_ecore_idle_enterer.pxi ecore.c_ecore_idle_exiter.pxi 
	ecore.c_ecore_idler.pxi ecore.c_ecore_timer.pxi 


Log Message:
Updating to use newer Cython (0.9.6.8).

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_animator.pxi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore.c_ecore_animator.pxi	30 Oct 2007 21:57:48 -0000	1.7
+++ ecore.c_ecore_animator.pxi	5 Nov 2007 22:05:54 -0000	1.8
@@ -2,7 +2,7 @@
 
 import traceback
 
-cdef int animator_cb(void *_td) with GIL:
+cdef int animator_cb(void *_td) with gil:
     cdef Animator obj
     cdef int r
 
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_fd_handler.pxi,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ecore.c_ecore_fd_handler.pxi	30 Oct 2007 21:57:48 -0000	1.8
+++ ecore.c_ecore_fd_handler.pxi	5 Nov 2007 22:05:54 -0000	1.9
@@ -2,7 +2,7 @@
 
 import traceback
 
-cdef void fd_handler_prepare_cb(void *_td, Ecore_Fd_Handler *fdh) with GIL:
+cdef void fd_handler_prepare_cb(void *_td, Ecore_Fd_Handler *fdh) with gil:
     cdef FdHandler obj
     cdef int r
 
@@ -27,7 +27,7 @@
     return ", ".join(flags)
 
 
-cdef int fd_handler_cb(void *_td, Ecore_Fd_Handler *fdh) with GIL:
+cdef int fd_handler_cb(void *_td, Ecore_Fd_Handler *fdh) with gil:
     cdef FdHandler obj
     cdef int r
 
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_idle_enterer.pxi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore.c_ecore_idle_enterer.pxi	30 Oct 2007 21:57:48 -0000	1.7
+++ ecore.c_ecore_idle_enterer.pxi	5 Nov 2007 22:05:54 -0000	1.8
@@ -2,7 +2,7 @@
 
 import traceback
 
-cdef int idle_enterer_cb(void *_td) with GIL:
+cdef int idle_enterer_cb(void *_td) with gil:
     cdef IdleEnterer obj
     cdef int r
 
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_idle_exiter.pxi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore.c_ecore_idle_exiter.pxi	30 Oct 2007 21:57:48 -0000	1.7
+++ ecore.c_ecore_idle_exiter.pxi	5 Nov 2007 22:05:54 -0000	1.8
@@ -2,7 +2,7 @@
 
 import traceback
 
-cdef int idle_exiter_cb(void *_td) with GIL:
+cdef int idle_exiter_cb(void *_td) with gil:
     cdef IdleExiter obj
     cdef int r
 
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_idler.pxi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore.c_ecore_idler.pxi	30 Oct 2007 21:57:48 -0000	1.7
+++ ecore.c_ecore_idler.pxi	5 Nov 2007 22:05:54 -0000	1.8
@@ -2,7 +2,7 @@
 
 import traceback
 
-cdef int idler_cb(void *_td) with GIL:
+cdef int idler_cb(void *_td) with gil:
     cdef Idler obj
     cdef int r
 
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_timer.pxi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore.c_ecore_timer.pxi	30 Oct 2007 21:57:48 -0000	1.7
+++ ecore.c_ecore_timer.pxi	5 Nov 2007 22:05:54 -0000	1.8
@@ -2,7 +2,7 @@
 
 import traceback
 
-cdef int timer_cb(void *_td) with GIL:
+cdef int timer_cb(void *_td) with gil:
     cdef Timer obj
     cdef int r

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-ecore


Modified Files:
	README setup.py 


Log Message:
Updating to use newer Cython (0.9.6.8).

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- README	30 Sep 2007 22:18:51 -0000	1.6
+++ README	5 Nov 2007 22:05:54 -0000	1.7
@@ -5,7 +5,7 @@
 
  * Evas >= 0.9.9.040
  * Ecore >= 0.9.9.040
- * Cython from Mercurial repository (http://www.cython.org/hg/)
+ * Cython >= 0.9.6.8
  * Python-Evas
  * Python >= 2.4
  * Python-setuptools >= 0.6_rc3
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/setup.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- setup.py	5 Nov 2007 21:50:55 -0000	1.17
+++ setup.py	5 Nov 2007 22:05:54 -0000	1.18
@@ -103,6 +103,7 @@
     def finalize_options(self):
         build_ext.finalize_options(self)
         self.include_dirs.insert(0, 'include')
+        self.pyrex_include_dirs.extend(self.include_dirs)
 
 
 setup(name='python-ecore',

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-edje/edje


Modified Files:
	edje.c_edje_object.pxi 


Log Message:
Updating to use newer Cython (0.9.6.8).

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-edje/edje/edje.c_edje_object.pxi,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- edje.c_edje_object.pxi	20 Oct 2007 22:19:34 -0000	1.23
+++ edje.c_edje_object.pxi	5 Nov 2007 22:08:46 -0000	1.24
@@ -4,7 +4,7 @@
 
 
 cdef void text_change_cb(void *data,
-                         evas.c_evas.Evas_Object *obj, char *part) with GIL:
+                         evas.c_evas.Evas_Object *obj, char *part) with gil:
     cdef Edje self
     self = <Edje>data
     if self._text_change_cb is None:
@@ -19,7 +19,7 @@
 cdef void message_handler_cb(void *data,
                              evas.c_evas.Evas_Object *obj,
                              Edje_Message_Type type,
-                             int id, void *msg) with GIL:
+                             int id, void *msg) with gil:
     cdef Edje self
     self = <Edje>data
     if self._message_handler_cb is None:
@@ -33,7 +33,7 @@
 
 cdef void signal_cb(void *data,
                     evas.c_evas.Evas_Object *obj,
-                    char *emission, char *source) with GIL:
+                    char *emission, char *source) with gil:
     cdef Edje self
     self = <Edje>evas.c_evas._Object_from_instance(<long>obj)
     lst = <object>data

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-edje


Modified Files:
	README setup.py 


Log Message:
Updating to use newer Cython (0.9.6.8).

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-edje/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- README	30 Sep 2007 22:35:31 -0000	1.4
+++ README	5 Nov 2007 22:08:46 -0000	1.5
@@ -9,7 +9,7 @@
  * Ecore >= 0.9.9.040   (indirect, Edje dependency)
  * Evas >= 0.9.9.040
  * Python-Evas
- * Cython from Mercurial repository (http://www.cython.org/hg/)
+ * Cython >= 0.9.6.8
  * Python >= 2.4
  * Python-setuptools >= 0.6_rc3
 
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-edje/setup.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- setup.py	4 Oct 2007 19:21:33 -0000	1.9
+++ setup.py	5 Nov 2007 22:08:46 -0000	1.10
@@ -95,6 +95,7 @@
     def finalize_options(self):
         build_ext.finalize_options(self)
         self.include_dirs.insert(0, 'include')
+        self.pyrex_include_dirs.extend(self.include_dirs)
 
 
 setup(name='python-edje',

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-epsilon/epsilon


Modified Files:
	epsilon.request.pyx 


Log Message:
Updating to use newer Cython (0.9.6.8).

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-epsilon/epsilon/epsilon.request.pyx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- epsilon.request.pyx	2 Nov 2007 08:03:46 -0000	1.3
+++ epsilon.request.pyx	5 Nov 2007 22:10:25 -0000	1.4
@@ -105,7 +105,7 @@
 init()
 cdef Ecore_Event_Handler *_epsilon_event_handler = NULL
 
-cdef int _epsilon_event_handler_cb(void *data, int type, void *event) with GIL:
+cdef int _epsilon_event_handler_cb(void *data, int type, void *event) with gil:
     cdef Epsilon_Request *er
     cdef Request obj

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-epsilon


Modified Files:
	README setup.py 


Log Message:
Updating to use newer Cython (0.9.6.8).

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-epsilon/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- README	31 Oct 2007 00:06:43 -0000	1.1
+++ README	5 Nov 2007 22:10:24 -0000	1.2
@@ -7,7 +7,7 @@
  * Ecore >= 0.9.9.041 (indirect, Epsilon dependency)
  * Python-Evas
  * Python-Ecore
- * Cython from Mercurial repository (http://www.cython.org/hg/)
+ * Cython >= 0.9.6.8
  * Python >= 2.4
  * Python-setuptools >= 0.6_rc3
 
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-epsilon/setup.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- setup.py	31 Oct 2007 00:06:43 -0000	1.1
+++ setup.py	5 Nov 2007 22:10:24 -0000	1.2
@@ -74,6 +74,7 @@
     def finalize_options(self):
         build_ext.finalize_options(self)
         self.include_dirs.insert(0, 'include')
+        self.pyrex_include_dirs.extend(self.include_dirs)
 
 
 setup(name='python-epsilon',

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-emotion/emotion


Modified Files:
	emotion.c_emotion.pyx 


Log Message:
Updating to use newer Cython (0.9.6.8).

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-emotion/emotion/emotion.c_emotion.pyx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- emotion.c_emotion.pyx	1 Oct 2007 04:38:41 -0000	1.8
+++ emotion.c_emotion.pyx	5 Nov 2007 22:11:45 -0000	1.9
@@ -2,7 +2,7 @@
 import evas.c_evas
 
 cdef void _emotion_callback(void *data,
-                            evas.c_evas.Evas_Object *o, void *ei) with GIL:
+                            evas.c_evas.Evas_Object *o, void *ei) with gil:
     cdef Emotion obj
     cdef object event
     obj = <Emotion>evas.c_evas._Object_from_instance(<long>o)

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-emotion


Modified Files:
	README setup.py 


Log Message:
Updating to use newer Cython (0.9.6.8).

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-emotion/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- README	30 Sep 2007 22:43:10 -0000	1.5
+++ README	5 Nov 2007 22:11:45 -0000	1.6
@@ -7,7 +7,7 @@
  * Evas >= 0.9.9.040  (indirect, Emotion dependency)
  * Ecore >= 0.9.9.040 (indirect, Emotion dependency)
  * Python-Evas
- * Cython from Mercurial repository (http://www.cython.org/hg/)
+ * Cython >= 0.9.6.8
  * Python >= 2.4
  * Python-setuptools >= 0.6_rc3
 
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-emotion/setup.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- setup.py	4 Oct 2007 19:21:33 -0000	1.8
+++ setup.py	5 Nov 2007 22:11:45 -0000	1.9
@@ -62,6 +62,7 @@
     def finalize_options(self):
         build_ext.finalize_options(self)
         self.include_dirs.insert(0, 'include')
+        self.pyrex_include_dirs.extend(self.include_dirs)
 
 
 setup(name='python-emotion',

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas/include


Removed Files:
	python.pxd 


Log Message:
Moving python.pxd to solve namespace issue with Cython.

We're having a problem with older versions of python-evas installed in the
system and Cython finding the wrong python.pxd when compiling the newer
python-evas module. Moving python.pxd to include/evas/python.pxd makes Cython
always find the correct one.

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas/include/evas


Added Files:
	python.pxd 


Log Message:
Moving python.pxd to solve namespace issue with Cython.

We're having a problem with older versions of python-evas installed in the
system and Cython finding the wrong python.pxd when compiling the newer
python-evas module. Moving python.pxd to include/evas/python.pxd makes Cython
always find the correct one.

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas


Modified Files:
	setup.py 


Log Message:
Moving python.pxd to solve namespace issue with Cython.

We're having a problem with older versions of python-evas installed in the
system and Cython finding the wrong python.pxd when compiling the newer
python-evas module. Moving python.pxd to include/evas/python.pxd makes Cython
always find the correct one.

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/setup.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- setup.py	5 Nov 2007 21:47:48 -0000	1.19
+++ setup.py	10 Nov 2007 22:51:23 -0000	1.20
@@ -39,7 +39,7 @@
                                 'evas/evas.c_evas_object_polygon.pxi',
                                 'evas/evas.c_evas_object_text.pxi',
                                 'include/evas/c_evas.pxd',
-                                'include/python.pxd',
+                                'include/evas/python.pxd',
                                 ],
                        **pkgconfig('"evas >= 0.9.9.040"')
                        )
@@ -48,7 +48,7 @@
 headers = ['evas/evas.c_evas.h',
            'include/evas/python_evas_utils.h',
            'include/evas/c_evas.pxd',
-           'include/python.pxd',
+           'include/evas/python.pxd',
            ]

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas/evas


Modified Files:
	evas.c_evas.pyx 


Log Message:
Moving python.pxd to solve namespace issue with Cython.

We're having a problem with older versions of python-evas installed in the
system and Cython finding the wrong python.pxd when compiling the newer
python-evas module. Moving python.pxd to include/evas/python.pxd makes Cython
always find the correct one.

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas.pyx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- evas.c_evas.pyx	25 Oct 2007 16:20:12 -0000	1.14
+++ evas.c_evas.pyx	10 Nov 2007 22:51:23 -0000	1.15
@@ -1,4 +1,4 @@
-cimport python
+cimport evas.python as python
 
 __extra_epydoc_fields__ = (
     ("parm", "Parameter", "Parameters"), # epydoc don't support pyrex properly

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas/tests


Added Files:
	13-image-rotate.py 


Log Message:
Add support for rotating images.

Patch by Leonardo Sobral.

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas/include


Added Files:
	evas_object_image_rotate.h 


Log Message:
Add support for rotating images.

Patch by Leonardo Sobral.

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas/evas


Modified Files:
	__init__.py evas.c_evas_object_image.pxi 
Added Files:
	evas_object_image_rotate.c 


Log Message:
Add support for rotating images.

Patch by Leonardo Sobral.

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/__init__.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- __init__.py	3 Oct 2007 04:44:24 -0000	1.16
+++ __init__.py	15 Nov 2007 22:38:11 -0000	1.17
@@ -77,5 +77,9 @@
 EVAS_OBJECT_POINTER_MODE_AUTOGRAB = 0
 EVAS_OBJECT_POINTER_MODE_NOGRAB = 1
 
+EVAS_IMAGE_ROTATE_NONE = 0
+EVAS_IMAGE_ROTATE_90 = 1
+EVAS_IMAGE_ROTATE_180 = 2
+EVAS_IMAGE_ROTATE_270 = 3
 
 c_evas.init()
===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_image.pxi,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- evas.c_evas_object_image.pxi	13 Nov 2007 15:53:45 -0000	1.13
+++ evas.c_evas_object_image.pxi	15 Nov 2007 22:38:11 -0000	1.14
@@ -1,5 +1,16 @@
 # This file is included verbatim by c_evas.pyx
 
+## for rotate support
+cdef extern from "evas_object_image_rotate.h":
+    ctypedef enum Rotation:
+            ROTATE_NONE
+            ROTATE_90
+            ROTATE_180
+            ROTATE_270
+
+    void evas_object_image_rotate(Evas_Object *image, Rotation rotation)
+
+
 cdef int _data_size_get(Evas_Object *obj):
     cdef int stride, h, bpp, cspace, have_alpha
     stride = evas_object_image_stride_get(obj)
@@ -436,6 +447,9 @@
 
         def __set__(self, int value):
             self.colorspace_set(value)
+
+    def rotate(self, int rotation):
+        evas_object_image_rotate(self.obj, <Rotation>rotation)
 
     def reload(self):
         "Force reload of image data."

Enlightenment CVS committal

Author  : ulisses
Project : e17
Module  : proto/python-efl

Dir     : e17/proto/python-efl/python-evas


Modified Files:
	setup.py 


Log Message:
Add support for rotating images.

Patch by Leonardo Sobral.

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/setup.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- setup.py	10 Nov 2007 22:51:23 -0000	1.20
+++ setup.py	15 Nov 2007 22:38:11 -0000	1.21
@@ -28,6 +28,7 @@
 
 evasmodule = Extension('evas.c_evas',
                        sources=['evas/evas.c_evas.pyx',
+                                'evas/evas_object_image_rotate.c',
                                 ],
                        depends=['evas/evas.c_evas_canvas.pxi',
                                 'evas/evas.c_evas_object.pxi',