use events instead of hardcoded keypress

thomasballinger · thomasballinger · commit 030b2cd7fe6b · 2014-08-05T14:35:43.000-04:00
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -77,7 +77,7 @@ def mainloop(config, locals_, banner, interp=None, paste=None, interactive=True)
 
             reload_requests = []
             def request_reload(desc):
-                reload_requests.append(desc)
+                reload_requests.append(curtsies.events.ReloadEvent([desc]))
             refresh_requests = []
             def request_refresh():
                 refresh_requests.append(curtsies.events.RefreshRequestEvent())
@@ -100,9 +100,7 @@ def event_or_refresh(timeout=None):
                     else:
                         while True:
                             if reload_requests:
-                                desc = ' & '.join(set(reload_requests))
-                                del reload_requests[:]
-                                e = '<F6>:' + desc
+                                e = reload_requests.pop()
                             else:
                                 e = input_generator.send(.2)
                             if e is not None:
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -358,6 +358,14 @@ def process_event(self, e):
             self.update_completion()
             return
 
+        elif isinstance(e, events.ReloadEvent) or e in key_dispatch[self.config.reimport_key]:
+            self.clear_modules_and_reevaluate()
+            self.update_completion()
+            if isinstance(e, events.ReloadEvent):
+                self.status_bar.message('Reloaded at ' + time.strftime('%H:%M:%S') + ' because ' + ' & '.join(e.files_modified) + ' modified')
+            else:
+                self.status_bar.message('Reloaded at ' + time.strftime('%H:%M:%S') + ' by user')
+
         elif (e in ("<RIGHT>", '<Ctrl-f>') and self.config.curtsies_right_arrow_completion
                 and self.cursor_offset == len(self.current_line)):
             self.current_line += self.current_suggestion
@@ -423,10 +431,6 @@ 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] or e.startswith('<F6>:'):
-            self.clear_modules_and_reevaluate()
-            self.update_completion()
-            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()
