diff options
author | Mattias Andrée <maandree@operamail.com> | 2015-05-16 18:20:40 +0200 |
---|---|---|
committer | Mattias Andrée <maandree@operamail.com> | 2015-05-16 18:20:40 +0200 |
commit | f811313ace319095b2cacdcb0894d137210a14ff (patch) | |
tree | ad2f0f8882bf16f4ea35b04adb942ce32d57a768 | |
parent | add new functions for bus 3.0 (diff) | |
download | python-bus-f811313ace319095b2cacdcb0894d137210a14ff.tar.gz python-bus-f811313ace319095b2cacdcb0894d137210a14ff.tar.bz2 python-bus-f811313ace319095b2cacdcb0894d137210a14ff.tar.xz |
fix poll
Signed-off-by: Mattias Andrée <maandree@operamail.com>
-rw-r--r-- | src/bus.py | 9 | ||||
-rw-r--r-- | src/native_bus.pyx | 4 |
2 files changed, 8 insertions, 5 deletions
@@ -208,7 +208,7 @@ class Bus: raise self.__oserror() - def poll(self) -> str: + def poll(self) -> bytes: ''' Wait for a message to be broadcasted on the bus. The caller should make a copy of the received message, @@ -217,11 +217,14 @@ class Bus: started, the caller of this function should then either call `Bus.poll` again or `Bus.poll_stop`. - @return :str The received message + @return :bytes The received message + NB! The received message will not be decoded from UTF-8 ''' from native_bus import bus_poll_wrapped - if bus_poll_wrapped(self.bus) == None: + message = bus_poll_wrapped(self.bus) + if message is None: raise self.__oserror() + return message def chown(self, owner : int, group : int): diff --git a/src/native_bus.pyx b/src/native_bus.pyx index c3c4039..75bb92a 100644 --- a/src/native_bus.pyx +++ b/src/native_bus.pyx @@ -332,7 +332,7 @@ def bus_poll_stop_wrapped(bus : int) -> int: return bus_poll_stop(<long>bus) -def bus_poll_wrapped(bus : int) -> str: +def bus_poll_wrapped(bus : int) -> bytes: ''' Wait for a message to be broadcasted on the bus. The caller should make a copy of the received message, @@ -351,7 +351,7 @@ def bus_poll_wrapped(bus : int) -> str: if msg is NULL: return None bs = msg - return bs.decode('utf-8', 'strict') + return bs def bus_chown_wrapped(file : str, owner : int, group : int) -> int: |