Code Review
/
ric-plt
/
sdlpy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Change notification callback and handle_events types
[ric-plt/sdlpy.git]
/
ricsdl-package
/
ricsdl
/
backend
/
fake_dict_db.py
diff --git
a/ricsdl-package/ricsdl/backend/fake_dict_db.py
b/ricsdl-package/ricsdl/backend/fake_dict_db.py
index
1a63ebd
..
94d0f32
100755
(executable)
--- a/
ricsdl-package/ricsdl/backend/fake_dict_db.py
+++ b/
ricsdl-package/ricsdl/backend/fake_dict_db.py
@@
-188,8
+188,7
@@
class FakeDictBackend(DbBackendAbc):
for channel, events in channels_and_events.items():
self._queue.put((channel, events))
for channel, events in channels_and_events.items():
self._queue.put((channel, events))
- def subscribe_channel(self, ns: str,
- cb: Union[Callable[[str, str], None], Callable[[str, List[str]], None]],
+ def subscribe_channel(self, ns: str, cb: Callable[[str, List[str]], None],
channels: List[str]) -> None:
for channel in channels:
self._channel_cbs[channel] = cb
channels: List[str]) -> None:
for channel in channels:
self._channel_cbs[channel] = cb
@@
-201,7
+200,7
@@
class FakeDictBackend(DbBackendAbc):
message = self._queue.get()
cb = self._channel_cbs.get(message[0], None)
if cb:
message = self._queue.get()
cb = self._channel_cbs.get(message[0], None)
if cb:
- cb(message[0], message[1]
[0] if (isinstance(message[1], list) and len(message[1]) == 1) else message[1]
)
+ cb(message[0], message[1])
time.sleep(0.001)
def unsubscribe_channel(self, ns: str, channels: List[str]) -> None:
time.sleep(0.001)
def unsubscribe_channel(self, ns: str, channels: List[str]) -> None:
@@
-215,7
+214,7
@@
class FakeDictBackend(DbBackendAbc):
self._listen_thread.start()
self._run_in_thread = True
self._listen_thread.start()
self._run_in_thread = True
- def handle_events(self) -> Optional[
Union[Tuple[str, str], Tuple[str, List[str]
]]]:
+ def handle_events(self) -> Optional[
Tuple[str, List[str
]]]:
if self._listen_thread.is_alive() or self._run_in_thread:
raise Exception("Event loop already started")
try:
if self._listen_thread.is_alive() or self._run_in_thread:
raise Exception("Event loop already started")
try:
@@
-223,10
+222,9
@@
class FakeDictBackend(DbBackendAbc):
except queue.Empty:
return None
cb = self._channel_cbs.get(message[0], None)
except queue.Empty:
return None
cb = self._channel_cbs.get(message[0], None)
- notifications = message[1][0] if (isinstance(message[1], list) and len(message[1]) == 1) else message[1]
if cb:
if cb:
- cb(message[0],
notifications
)
- return (message[0],
notifications
)
+ cb(message[0],
message[1]
)
+ return (message[0],
message[1]
)
class FakeDictBackendLock(DbBackendLockAbc):
class FakeDictBackendLock(DbBackendLockAbc):