less unnecessary reloading

thomasballinger · thomasballinger · commit 7c89493e2756 · 2014-08-05T14:35:43.000-04:00
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -76,8 +76,8 @@ def mainloop(config, locals_, banner, interp=None, paste=None, interactive=True)
                 extra_bytes_callback=input_generator.unget_bytes) as window:
 
             reload_requests = []
-            def request_reload():
-                reload_requests.append('reload!')
+            def request_reload(desc):
+                reload_requests.append(desc)
             refresh_requests = []
             def request_refresh():
                 refresh_requests.append(curtsies.events.RefreshRequestEvent())
@@ -100,9 +100,9 @@ def event_or_refresh(timeout=None):
                     else:
                         while True:
                             if reload_requests:
+                                desc = ' & '.join(set(reload_requests))
                                 del reload_requests[:]
-                                e = '<F6>'
-                                print 'asdf'
+                                e = '<F6>:' + desc
                             else:
                                 e = input_generator.send(.2)
                             if e is not None:
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -423,10 +423,10 @@ def process_event(self, e):
         elif e in ("<Shift-TAB>",):
             self.on_tab(back=True)
             self.rl_history.reset()
-        elif e in key_dispatch[self.config.reimport_key]:
+        elif e in key_dispatch[self.config.reimport_key] or e.startswith('<F6>:'):
             self.clear_modules_and_reevaluate()
             self.update_completion()
-            self.status_bar.message(_('Reloaded at ')+time.strftime('%H:%M:%S'))
+            self.status_bar.message('Reloaded ' + e[5:] + ' at '+time.strftime('%H:%M:%S'))
         elif e in key_dispatch[self.config.undo_key]: #ctrl-r for undo
             self.undo()
             self.update_completion()
diff --git a/wdtest.py b/wdtest.py
@@ -30,12 +30,9 @@ def add_module(self, path):
 
     def on_any_event(self, event):
         dirpath = os.path.dirname(event.src_path)
-        paths = [path + suffix for suffix in importcompletion.SUFFIXES
-                               for path in self.dirs[dirpath]]
+        paths = [path + '.py' for path in self.dirs[dirpath]]
         if event.src_path in paths:
-            pass
-            #self.on_change()
-        self.on_change()
+            self.on_change(event.src_path)
 
 if __name__ == '__main__':
     m = ModuleChangedEventHandler([])
