Commit 3d08f3f0 authored by Peter Seiderer's avatar Peter Seiderer Committed by Thomas Petazzoni
Browse files

evemu: enable python3 bindings 

Add evemu/python3 related patches:
- fix python/evemu/base.py for python3 (add patch from [1])
- fix python3 binding runtime failure

[1] http://ftp.de.debian.org/debian/pool/main/e/evemu/evemu_1.2.0-2.debian.tar.xz



Signed-off-by: default avatarPeter Seiderer <ps.report@gmx.net>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 6c189442

package/evemu/evemu-0006-Description-fixes-the-syntax-for-raising-exceptions-.patch

0 → 100644
+27 −0
Original line number Diff line number Diff line 
Description: fixes the syntax for raising exceptions to be Python2 and Python3

 acceptable.

Author: Stephen M. Webb

Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=706155



--- a/python/evemu/base.py

+++ b/python/evemu/base.py

@@ -19,15 +19,15 @@

     def _call0(self, api_call, *parameters):

         result = api_call(*parameters)

         if result == 0 and self.get_c_errno() != 0:

-            raise exception.ExecutionError, "%s: %s" % (

-                api_call.__name__, self.get_c_error())

+            raise exception.ExecutionError("%s: %s" % (

+                api_call.__name__, self.get_c_error()))

         return result

 

     def _call(self, api_call, *parameters):

         result = api_call(*parameters)

         if result < 0 and self.get_c_errno() != 0:

-            raise exception.ExecutionError, "%s: %s" % (

-                api_call.__name__, self.get_c_error())

+            raise exception.ExecutionError("%s: %s" % (

+                api_call.__name__, self.get_c_error()))

         return result

 

     def get_c_errno(self):

package/evemu/evemu-0007-python-fix-device-open-for-python3.patch

0 → 100644
+35 −0
Original line number Diff line number Diff line 
From f192db7848962a1616e243bb60e705da6c6f3412 Mon Sep 17 00:00:00 2001

From: Peter Seiderer <ps.report@gmx.net>

Date: Sun, 27 Apr 2014 01:16:16 +0200

Subject: [PATCH] python: fix device open for python3



- use 'rb' instead of 'r+b', fixes:



>>> import evemu

>>> evemu.Device('/dev/input/event0')

Traceback (most recent call last):

  File "<stdin>", line 1, in <module>

  File "/usr/lib/python3.4/site-packages/evemu/__init__.py", line 50, in __init__

io.UnsupportedOperation: File or stream is not seekable.



Signed-off-by: Peter Seiderer <ps.report@gmx.net>

---

 python/evemu/__init__.py | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/python/evemu/__init__.py b/python/evemu/__init__.py

index abdbf7e..aa73871 100644

--- a/python/evemu/__init__.py

+++ b/python/evemu/__init__.py

@@ -47,7 +47,7 @@ class Device(object):

         """

 

         if type(f).__name__ == 'str':

-            self._file = open(f, 'r+b')

+            self._file = open(f, 'rb')

         elif type(f).__name__ == 'file':

             self._file = f

         else:

-- 

1.8.1.4

package/evemu/evemu.mk

+3 −4
Original line number Diff line number Diff line
@@ -27,11 +27,10 @@ EVEMU_DEPENDENCIES = host-pkgconf libevdev 
# Needs Python for header file generation

EVEMU_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python)



# Check for target python (python3 bindings disabled because

# of build/byte-compile problems)

ifeq ($(BR2_PACKAGE_PYTHON),y)

# Check for target python

ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)

EVEMU_CONF_OPT += --enable-python-bindings

EVEMU_DEPENDENCIES += python

EVEMU_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python)

else

EVEMU_CONF_OPT += --disable-python-bindings

endif