From 36a2aa754ad516caaa5a27e8c256c37ef9239f8d Mon Sep 17 00:00:00 2001 From: Joel Bender Date: Sat, 23 Jan 2016 21:22:21 -0500 Subject: [PATCH] match darwin as well as linux for triggers, which fixes a really irritating bug in MacOS that kept applications from quitting correctly and they would have to be killed --- py25/bacpypes/task.py | 6 ++++-- py27/bacpypes/task.py | 6 ++++-- py34/bacpypes/task.py | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/py25/bacpypes/task.py b/py25/bacpypes/task.py index 7e5d22b..6d0ffab 100755 --- a/py25/bacpypes/task.py +++ b/py25/bacpypes/task.py @@ -21,7 +21,7 @@ _task_manager = None _unscheduled_tasks = [] # only defined for linux platforms -if 'linux' in sys.platform: +if sys.platform.startswith(('linux', 'darwin')): from .event import WaitableEvent # # _Trigger @@ -39,6 +39,8 @@ if 'linux' in sys.platform: # read in the character, highlander data = self.recv(1) if _debug: _Trigger._debug(" - data: %r", data) +else: + _Trigger = None # # _Task @@ -257,7 +259,7 @@ class TaskManager(SingletonLogging): # initialize self.tasks = [] - if 'linux' in sys.platform: + if _Trigger: self.trigger = _Trigger() else: self.trigger = None diff --git a/py27/bacpypes/task.py b/py27/bacpypes/task.py index 99e3ec1..34d5cc6 100755 --- a/py27/bacpypes/task.py +++ b/py27/bacpypes/task.py @@ -21,7 +21,7 @@ _task_manager = None _unscheduled_tasks = [] # only defined for linux platforms -if 'linux' in sys.platform: +if sys.platform.startswith(('linux', 'darwin')): from .event import WaitableEvent # # _Trigger @@ -39,6 +39,8 @@ if 'linux' in sys.platform: # read in the character, highlander data = self.recv(1) if _debug: _Trigger._debug(" - data: %r", data) +else: + _Trigger = None # # _Task @@ -253,7 +255,7 @@ class TaskManager(SingletonLogging): # initialize self.tasks = [] - if 'linux' in sys.platform: + if _Trigger: self.trigger = _Trigger() else: self.trigger = None diff --git a/py34/bacpypes/task.py b/py34/bacpypes/task.py index 99e3ec1..34d5cc6 100755 --- a/py34/bacpypes/task.py +++ b/py34/bacpypes/task.py @@ -21,7 +21,7 @@ _task_manager = None _unscheduled_tasks = [] # only defined for linux platforms -if 'linux' in sys.platform: +if sys.platform.startswith(('linux', 'darwin')): from .event import WaitableEvent # # _Trigger @@ -39,6 +39,8 @@ if 'linux' in sys.platform: # read in the character, highlander data = self.recv(1) if _debug: _Trigger._debug(" - data: %r", data) +else: + _Trigger = None # # _Task @@ -253,7 +255,7 @@ class TaskManager(SingletonLogging): # initialize self.tasks = [] - if 'linux' in sys.platform: + if _Trigger: self.trigger = _Trigger() else: self.trigger = None