update config for scroll->curtsies name change

thomasballinger · thomasballinger · commit 1934a83cb80e · 2013-12-17T16:06:53.000-05:00
--HG--
branch : scroll-frontend
diff --git a/bpython/config.py b/bpython/config.py
@@ -96,7 +96,7 @@ def loadini(struct, configfile):
             'suggestion_width': 0.8,
             'trim_prompts': False,
         },
-        'scroll': {
+        'curtsies': {
             'list_above' : False,
             'fill_terminal' : False,
         },
@@ -163,8 +163,8 @@ def loadini(struct, configfile):
 
     struct.gtk_font = config.get('gtk', 'font')
 
-    struct.scroll_list_above = config.getboolean('scroll', 'list_above')
-    struct.scroll_fill_terminal = config.getboolean('scroll', 'fill_terminal')
+    struct.curtsies_list_above = config.getboolean('curtsies', 'list_above')
+    struct.curtsies_fill_terminal = config.getboolean('curtsies', 'fill_terminal')
 
     color_scheme_name = config.get('general', 'color_scheme')
     color_gtk_scheme_name = config.get('gtk', 'color_scheme')
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -136,7 +136,7 @@ def __init__(self, locals_=None, config=None, stuff_a_refresh_request=lambda: No
         if config.cli_suggestion_width <= 0 or config.cli_suggestion_width > 1:
             config.cli_suggestion_width = 1
 
-        self.status_bar = StatusBar(banner if config.scroll_fill_terminal else '', _(
+        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))
         self.rl_char_sequences = get_updated_char_sequences(key_dispatch, config)
@@ -612,14 +612,14 @@ def paint(self, about_to_exit=False):
             self.clean_up_current_line_for_exit() # exception to not changing state!
 
         width, min_height = self.width, self.height
-        show_status_bar = bool(self.status_bar._message) or (self.config.scroll_fill_terminal or self.status_bar.has_focus)
+        show_status_bar = bool(self.status_bar._message) or (self.config.curtsies_fill_terminal or self.status_bar.has_focus)
         if show_status_bar:
             min_height -= 1
 
         current_line_start_row = len(self.lines_for_display) - max(0, self.scroll_offset)
         if self.request_paint_to_clear_screen: # or show_status_bar and about_to_exit ?
             self.request_paint_to_clear_screen = False
-            if self.config.scroll_fill_terminal: #TODO clean up this logic - really necessary check?
+            if self.config.cursties_fill_terminal: #TODO clean up this logic - really necessary check?
                 arr = FSArray(self.height - 1 + current_line_start_row, width)
             else:
                 arr = FSArray(self.height + current_line_start_row, width)
@@ -683,15 +683,15 @@ def paint(self, about_to_exit=False):
             info_max_rows = max(visible_space_above, visible_space_below)
             infobox = paint.paint_infobox(info_max_rows, int(width * self.config.cli_suggestion_width), self.matches, self.argspec, self.current_word, self.docstring, self.config)
 
-            if visible_space_above >= infobox.height and self.config.scroll_list_above:
+            if visible_space_above >= infobox.height and self.config.curtsies_list_above:
                 arr[current_line_start_row - infobox.height:current_line_start_row, 0:infobox.width] = infobox
             else:
                 arr[cursor_row + 1:cursor_row + 1 + infobox.height, 0:infobox.width] = infobox
                 logging.debug('slamming infobox of shape %r into arr of shape %r', infobox.shape, arr.shape)
 
         logging.debug('about to exit: %r', about_to_exit)
         if show_status_bar:
-            if self.config.scroll_fill_terminal:
+            if self.config.curtsies_fill_terminal:
                 if about_to_exit:
                     arr[max(arr.height, min_height), :] = FSArray(1, width)
                 else:
diff --git a/doc/sphinx/source/configuration-options.rst b/doc/sphinx/source/configuration-options.rst
@@ -259,9 +259,9 @@ Default: Monospace 10
 
 The font to be used by the GTK version.
 
-scroll
-------
-This refers to the ``[scroll]`` section in your config file.
+curtsies
+--------
+This refers to the ``[curtsies]`` section in your config file.
 
 .. versionadded:: 0.13
 
