From 8fee5db675744a6cc9a3462b7d1261e0b940545c Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 14 Jul 2016 21:33:53 +1200 Subject: [PATCH] Always use PollingObserver --- mitmproxy/builtins/script.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/mitmproxy/builtins/script.py b/mitmproxy/builtins/script.py index 34801ff77..f6cf093f7 100644 --- a/mitmproxy/builtins/script.py +++ b/mitmproxy/builtins/script.py @@ -13,12 +13,7 @@ from mitmproxy import ctx import watchdog.events -# The OSX reloader in watchdog 0.8.3 breaks when unobserving paths. -# We use the PollingObserver instead. -if sys.platform == 'darwin': # pragma: no cover - from watchdog.observers.polling import PollingObserver as Observer -else: - from watchdog.observers import Observer +from watchdog.observers import polling def parse_command(command): @@ -134,7 +129,7 @@ class Script: def configure(self, options): self.last_options = options if not self.observer: - self.observer = Observer() + self.observer = polling.PollingObserver() # Bind the handler to the real underlying master object self.observer.schedule( ReloadHandler(self.reload),