Move reloading code into curtsies Repl object

thomasballinger · thomasballinger · commit 8e10646a31f9 · 2014-08-10T00:22:33.000-04:00
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -20,8 +20,6 @@
 from bpython.translations import _
 from bpython.importcompletion import find_iterator
 
-import wdtest
-
 repl = None # global for `from bpython.curtsies import repl`
 #WARNING Will be a problem if more than one repl is ever instantiated this way
 
@@ -83,17 +81,6 @@ def request_reload(desc):
             def request_refresh(when='now'):
                 refresh_requests.append(curtsies.events.RefreshRequestEvent(when=when))
 
-            watcher = wdtest.ModuleChangedEventHandler([], request_reload)
-
-            orig_import = __builtins__['__import__']
-            @wraps(orig_import)
-            def new_import(name, globals={}, locals={}, fromlist=[], level=-1):
-                m = orig_import(name, globals=globals, locals=locals, fromlist=fromlist)
-                if hasattr(m, "__file__"):
-                    watcher.add_module(m.__file__)
-                return m
-            __builtins__['__import__'] = new_import
-
             def event_or_refresh(timeout=None):
                 while True:
                     t = time.time()
@@ -112,6 +99,7 @@ def event_or_refresh(timeout=None):
             with Repl(config=config,
                       locals_=locals_,
                       request_refresh=request_refresh,
+                      request_reload=request_reload,
                       get_term_hw=window.get_term_hw,
                       get_cursor_vertical_diff=window.get_cursor_vertical_diff,
                       banner=banner,
diff --git a/bpython/curtsiesfrontend/filewatch.py b/bpython/curtsiesfrontend/filewatch.py
@@ -9,13 +9,17 @@
 
 class ModuleChangedEventHandler(FileSystemEventHandler):
     def __init__(self, paths, on_change):
-        self.dirs = defaultdict(list)
+        self.dirs = defaultdict(set)
         self.on_change = on_change
         self.observer = Observer()
         for path in paths:
             self.add_module(path)
         self.observer.start()
 
+    def reset(self):
+        self.dirs = defaultdict(set)
+        self.observer.unschedule_all()
+
     def add_module(self, path):
         """Add a python module to track changes to"""
         path = os.path.abspath(path)
@@ -26,7 +30,7 @@ def add_module(self, path):
         dirname = os.path.dirname(path)
         if dirname not in self.dirs:
             self.observer.schedule(self, dirname, recursive=False)
-            self.dirs[os.path.dirname(path)].append(path)
+            self.dirs[os.path.dirname(path)].add(path)
 
     def on_any_event(self, event):
         dirpath = os.path.dirname(event.src_path)
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -1,6 +1,7 @@
 import code
 import contextlib
 import errno
+import functools
 import greenlet
 import logging
 import os
@@ -38,6 +39,7 @@
 from bpython.curtsiesfrontend import sitefix; sitefix.monkeypatch_quit()
 import bpython.curtsiesfrontend.replpainter as paint
 from bpython.curtsiesfrontend.coderunner import CodeRunner, FakeOutput
+from bpython.curtsiesfrontend.filewatch import ModuleChangedEventHandler
 
 #TODO other autocomplete modes (also fix in other bpython implementations)
 
@@ -174,10 +176,10 @@ class Repl(BpythonRepl):
     """
 
     ## initialization, cleanup
-    def __init__(self, locals_=None, config=None,
-            request_refresh=lambda: None, get_term_hw=lambda:(50, 10),
-            get_cursor_vertical_diff=lambda: 0, banner=None, interp=None, interactive=True,
-            orig_tcattrs=None):
+    def __init__(self, locals_=None, config=None, request_refresh=lambda: None,
+            request_reload=lambda desc: None, get_term_hw=lambda:(50, 10),
+            get_cursor_vertical_diff=lambda: 0, banner=None, interp=None,
+            interactive=True, orig_tcattrs=None):
         """
         locals_ is a mapping of locals to pass into the interpreter
         config is a bpython config.Struct with config attributes
@@ -217,6 +219,12 @@ def smarter_request_refresh(when='now'):
             else:
                 request_refresh(when=when)
         self.request_refresh = smarter_request_refresh
+        def smarter_request_reload(desc):
+            if self.watching_files:
+                request_reload(desc)
+            else:
+                pass
+        self.request_reload = smarter_request_reload
         self.get_term_hw = get_term_hw
         self.get_cursor_vertical_diff = get_cursor_vertical_diff
 
@@ -271,6 +279,8 @@ def smarter_request_refresh(when='now'):
         self.width = None  # will both be set by a window resize event
         self.height = None
 
+        self.watcher = ModuleChangedEventHandler([], smarter_request_reload)
+
     def __enter__(self):
         self.orig_stdout = sys.stdout
         self.orig_stderr = sys.stderr
@@ -280,13 +290,24 @@ def __enter__(self):
         sys.stdin = self.stdin
         self.orig_sigwinch_handler = signal.getsignal(signal.SIGWINCH)
         signal.signal(signal.SIGWINCH, self.sigwinch_handler)
+
+        self.orig_import = __builtins__['__import__']
+        @functools.wraps(self.orig_import)
+        def new_import(name, globals={}, locals={}, fromlist=[], level=-1):
+            m = self.orig_import(name, globals=globals, locals=locals, fromlist=fromlist)
+            if hasattr(m, "__file__"):
+                self.watcher.add_module(m.__file__)
+            return m
+        __builtins__['__import__'] = new_import
+
         return self
 
     def __exit__(self, *args):
         sys.stdin = self.orig_stdin
         sys.stdout = self.orig_stdout
         sys.stderr = self.orig_stderr
         signal.signal(signal.SIGWINCH, self.orig_sigwinch_handler)
+        __builtins__['__import__'] = self.orig_import
 
     def sigwinch_handler(self, signum, frame):
         old_rows, old_columns = self.height, self.width
@@ -373,6 +394,7 @@ def process_event(self, e):
         elif e in key_dispatch[self.config.toggle_file_watch_key]:
             msg = "Auto-reloading active, watching for file changes..."
             if self.watching_files:
+                self.watcher.reset()
                 self.watching_files = False
                 self.status_bar.pop_permanent_message(msg)
             else:
