rename 'stuff_a_refresh_request' to request_refresh

thomasballinger · thomasballinger · commit 26eccbdf749b · 2014-03-22T10:59:24.000-04:00
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -55,7 +55,7 @@ def mainloop(config, locals_, banner, interp=None, paste=None):
         with Window(tc, keep_last_line=True, hide_cursor=False) as term:
             with Repl(config=config,
                       locals_=locals_,
-                      stuff_a_refresh_request=tc.stuff_a_refresh_request,
+                      request_refresh=tc.stuff_a_refresh_request,
                       banner=banner,
                       interp=interp) as repl:
                 rows, columns = tc.get_screen_size()
diff --git a/bpython/curtsiesfrontend/interaction.py b/bpython/curtsiesfrontend/interaction.py
@@ -19,7 +19,7 @@ class StatusBar(BpythonInteraction):
     functionality in a evented or callback style, but trying to integrate
     bpython.Repl code.
     """
-    def __init__(self, initial_message='', permanent_text="", stuff_a_refresh_request=lambda: None):
+    def __init__(self, initial_message='', permanent_text="", refresh_request=lambda: None):
         self._current_line = ''
         self.cursor_offset_in_line = 0
         self.in_prompt = False
@@ -32,7 +32,7 @@ def __init__(self, initial_message='', permanent_text="", stuff_a_refresh_reques
         self.permanent_text = permanent_text
         self.main_greenlet = greenlet.getcurrent()
         self.request_greenlet = None
-        self.stuff_a_refresh_request = stuff_a_refresh_request
+        self.refresh_request = refresh_request
 
     @property
     def has_focus(self):
@@ -107,7 +107,7 @@ def notify(self, msg, n=3):
         self.message_time = n
         self.message(msg)
         self.waiting_for_refresh = True
-        self.stuff_a_refresh_request()
+        self.refresh_request()
         self.main_greenlet.switch(msg)
 
     # below Really ought to be called from greenlets other than main because they block
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -142,11 +142,11 @@ class Repl(BpythonRepl):
     """
 
     ## initialization, cleanup
-    def __init__(self, locals_=None, config=None, stuff_a_refresh_request=lambda: None, banner=None, interp=None):
+    def __init__(self, locals_=None, config=None, request_refresh=lambda: None, banner=None, interp=None):
         """
         locals_ is a mapping of locals to pass into the interpreter
         config is a bpython config.Struct with config attributes
-        stuff_a_refresh_request is a function that will be called when the Repl
+        request_refresh is a function that will be called when the Repl
             wants to refresh the display, but wants control returned to it afterwards
         banner is a string to display briefly in the status bar
         interp is an interpreter to use
@@ -173,17 +173,17 @@ def __init__(self, locals_=None, config=None, stuff_a_refresh_request=lambda: No
 
         self.reevaluating = False
         self.fake_refresh_requested = False
-        def request_refresh():
+        def smarter_request_refresh():
             if self.reevaluating or self.paste_mode:
                 self.fake_refresh_requested = True
             else:
-                stuff_a_refresh_request()
-        self.stuff_a_refresh_request = request_refresh
+                request_refresh()
+        self.request_refresh = smarter_request_refresh
 
         self.status_bar = StatusBar(banner if config.curtsies_fill_terminal else '', _(
             " <%s> Rewind  <%s> Save  <%s> Pastebin <%s> Editor"
             ) % (config.undo_key, config.save_key, config.pastebin_key, config.external_editor_key),
-            stuff_a_refresh_request=self.stuff_a_refresh_request
+            refresh_request=self.request_refresh
             )
         self.rl_char_sequences = get_updated_char_sequences(key_dispatch, config)
         logging.debug("starting parent init")
@@ -920,7 +920,7 @@ def simple_repl():
     refreshes = []
     def request_refresh():
         refreshes.append(1)
-    with Repl(stuff_a_refresh_request=request_refresh) as r:
+    with Repl(refresh_request=request_refresh) as r:
         r.width = 50
         r.height = 10
         while True:
