From 5ba73b9e6ed3812bc47bc52a8b126a3ce2039433 Mon Sep 17 00:00:00 2001 From: Thomas Amland Date: Fri, 5 Sep 2014 14:45:33 +0200 Subject: [PATCH] add accessor to emitters created by observer --- src/watchdog/observers/api.py | 5 +++++ tests/test_observer.py | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/watchdog/observers/api.py b/src/watchdog/observers/api.py index 98dd883c0..4d1ce688f 100644 --- a/src/watchdog/observers/api.py +++ b/src/watchdog/observers/api.py @@ -245,6 +245,11 @@ def _add_handler_for_watch(self, event_handler, watch): def _remove_handlers_for_watch(self, watch): del self._handlers[watch] + @property + def emitters(self): + """Returns event emitter created by this observer.""" + return self._emitters + def start(self): for emitter in self._emitters: emitter.start() diff --git a/tests/test_observer.py b/tests/test_observer.py index 95cdd932d..018806aeb 100644 --- a/tests/test_observer.py +++ b/tests/test_observer.py @@ -36,27 +36,27 @@ def finalizer(): def test_schedule_should_start_emitter_if_running(observer): observer.start() observer.schedule(None, '') - (emitter,) = observer._emitters + (emitter,) = observer.emitters assert emitter.is_alive() def test_schedule_should_not_start_emitter_if_not_running(observer): observer.schedule(None, '') - (emitter,) = observer._emitters + (emitter,) = observer.emitters assert not emitter.is_alive() def test_start_should_start_emitter(observer): observer.schedule(None, '') observer.start() - (emitter,) = observer._emitters + (emitter,) = observer.emitters assert emitter.is_alive() def test_stop_should_stop_emitter(observer): observer.schedule(None, '') observer.start() - (emitter,) = observer._emitters + (emitter,) = observer.emitters assert emitter.is_alive() observer.stop() observer.join()