Skip to content

Fix issue #394 #397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
felixdivo merged 2 commits into from
Aug 24, 2018
Merged

Fix issue #394 #397

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e67cab
fix #394
felixdivo Aug 24, 2018
0ecc555
fix stupid bug
felixdivo Aug 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions can/thread_safe_bus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@


try:
from contextlib import nullcontext as NullContextManager
from contextlib import nullcontext

except ImportError:
class NullContextManager(object):
class nullcontext(object):
"""A context manager that does nothing at all.
A fallback for Python 3.7's :class:`contextlib.nullcontext` manager.
"""
Expand Down Expand Up @@ -53,10 +53,6 @@ class ThreadSafeBus(ObjectProxy):
instead of :meth:`~can.BusABC.recv` directly.
"""

# init locks for sending and receiving separately
_lock_send = RLock()
_lock_recv = RLock()

def __init__(self, *args, **kwargs):
if import_exc is not None:
raise import_exc
Expand All @@ -65,7 +61,11 @@ def __init__(self, *args, **kwargs):

# now, BusABC.send_periodic() does not need a lock anymore, but the
# implementation still requires a context manager
self.__wrapped__._lock_send_periodic = NullContextManager()
self.__wrapped__._lock_send_periodic = nullcontext()

# init locks for sending and receiving separately
self._lock_send = RLock()
self._lock_recv = RLock()

def recv(self, timeout=None, *args, **kwargs):
with self._lock_recv:
Expand Down