davemds pushed a commit to branch master.
commit 86df76780a6519580b044ddae45609cd9faee181
Author: davemds <[email protected]>
Date: Wed Apr 3 12:59:11 2013 +0200
Python-EFL: fix evas events for py3 and remove that hack in emotion test
---
efl/evas/efl.evas_object_events.pxi | 40 ++++++++-----------------------------
examples/emotion/test_emotion.py | 2 +-
2 files changed, 9 insertions(+), 33 deletions(-)
diff --git a/efl/evas/efl.evas_object_events.pxi
b/efl/evas/efl.evas_object_events.pxi
index 2e4143d..e8d6a2d 100644
--- a/efl/evas/efl.evas_object_events.pxi
+++ b/efl/evas/efl.evas_object_events.pxi
@@ -770,34 +770,22 @@ cdef class EventKeyDown:
property keyname:
def __get__(self):
self._check_validity()
- if self.obj.keyname == NULL:
- return None
- else:
- return self.obj.keyname
+ return _ctouni(self.obj.keyname)
property key:
def __get__(self):
self._check_validity()
- if self.obj.key == NULL:
- return None
- else:
- return self.obj.key
+ return _ctouni(self.obj.key)
property string:
def __get__(self):
self._check_validity()
- if self.obj.string == NULL:
- return None
- else:
- return self.obj.string
+ return _ctouni(self.obj.string)
property compose:
def __get__(self):
self._check_validity()
- if self.obj.compose == NULL:
- return None
- else:
- return self.obj.compose
+ return _ctouni(self.obj.compose)
property timestamp:
def __get__(self):
@@ -840,34 +828,22 @@ cdef class EventKeyUp:
property keyname:
def __get__(self):
self._check_validity()
- if self.obj.keyname == NULL:
- return None
- else:
- return self.obj.keyname
+ return _ctouni(self.obj.keyname)
property key:
def __get__(self):
self._check_validity()
- if self.obj.key == NULL:
- return None
- else:
- return self.obj.key
+ return _ctouni(self.obj.key)
property string:
def __get__(self):
self._check_validity()
- if self.obj.string == NULL:
- return None
- else:
- return self.obj.string
+ return _ctouni(self.obj.string)
property compose:
def __get__(self):
self._check_validity()
- if self.obj.compose == NULL:
- return None
- else:
- return self.obj.compose
+ return _ctouni(self.obj.compose)
property timestamp:
def __get__(self):
diff --git a/examples/emotion/test_emotion.py b/examples/emotion/test_emotion.py
index 58a5dd6..fc0d158 100644
--- a/examples/emotion/test_emotion.py
+++ b/examples/emotion/test_emotion.py
@@ -281,7 +281,7 @@ class AppKeyboardEvents(object):
}
def __call__(self, win, info):
try:
- params = self.key_dispatcher[info.keyname.decode("ASCII")] # TODO
FIXME ?
+ params = self.key_dispatcher[info.keyname]
f = params[0]
args = params[1:]
f(win, *args)
--
------------------------------------------------------------------------------
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire
the most talented Cisco Certified professionals. Visit the
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
