First stage of Interaction abstraction. All frontends now implement repl.Interaction to show messages and generally interact with the user (prompts, notices, save prompts)

ikanobori · ikanobori · commit 9aff5bc3abc3 · 2010-04-01T22:52:06.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -58,8 +58,8 @@
 # This for keys
 from bpython.keys import key_dispatch
 
+from bpython import repl
 from bpython.pager import page
-from bpython.repl import Interpreter, Repl
 import bpython.args
 
 
@@ -233,10 +233,25 @@ def make_colors(config):
     return c
 
 
-class CLIRepl(Repl):
+class CLIInteraction(repl.Interaction):
+    def __init__(self, config, statusbar=None):
+        repl.Interaction.__init__(self, config, statusbar)
+
+    def confirm(self, q):
+        """Ask for yes or no and return boolean"""
+        return self.statusbar.prompt(q).lower().startswith('y')
+ 
+    def notify(self, s, n=10):
+        return self.statusbar.message(s, n)
+
+    def file_prompt(self, s):
+        return self.statusbar.prompt(s)
+
+
+class CLIRepl(repl.Repl):
 
     def __init__(self, scr, interp, statusbar, config, idle=None):
-        Repl.__init__(self, interp, config)
+        repl.Repl.__init__(self, interp, config)
         interp.writetb = self.writetb
         self.scr = scr
         self.stdout_hist = ''
@@ -251,6 +266,7 @@ def __init__(self, scr, interp, statusbar, config, idle=None):
         self.s = ''
         self.statusbar = statusbar
         self.formatter = BPythonFormatter(config.color_scheme)
+        self.interact = CLIInteraction(self.config, statusbar=self.statusbar)
 
     def addstr(self, s):
         """Add a string to the current input line and figure out
@@ -334,7 +350,7 @@ def clear_current_line(self):
         """Called when a SyntaxError occured in the interpreter. It is
         used to prevent autoindentation from occuring after a
         traceback."""
-        Repl.clear_current_line(self)
+        repl.Repl.clear_current_line(self)
         self.s = ''
 
     def clear_wrapped_lines(self):
@@ -359,7 +375,7 @@ def complete(self, tab=False):
             return
 
         if self.config.auto_display_list or tab:
-            self.list_win_visible = Repl.complete(self, tab)
+            self.list_win_visible = repl.Repl.complete(self, tab)
             if self.list_win_visible:
                 try:
                     self.show_list(self.matches, self.argspec)
@@ -900,7 +916,7 @@ def push(self, s, insert_into_history=True):
         # curses.raw(True) prevents C-c from causing a SIGINT
         curses.raw(False)
         try:
-            return Repl.push(self, s, insert_into_history)
+            return repl.Repl.push(self, s, insert_into_history)
         except SystemExit:
             # Avoid a traceback on e.g. quit()
             self.do_exit = True
@@ -998,10 +1014,7 @@ def resize(self):
         self.statusbar.resize(refresh=False)
         self.redraw()
 
-    def ask_confirmation(self, q):
-        """Ask for yes or no and return boolean"""
-        return self.statusbar.prompt(q).lower().startswith('y')
- 
+
     def getstdout(self):
         """This method returns the 'spoofed' stdout buffer, for writing to a
         file or sending to a pastebin or whatever."""
@@ -1293,7 +1306,7 @@ def tab(self, back=False):
         return True
 
     def undo(self, n=1):
-        Repl.undo(self, n)
+        repl.Repl.undo(self, n)
 
         # This will unhighlight highlighted parens
         self.print_line(self.s)
@@ -1613,6 +1626,7 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
     global stdscr
     global DO_RESIZE
     global colors
+    global repl
     DO_RESIZE = False
 
     old_sigwinch_handler = signal.signal(signal.SIGWINCH,
@@ -1639,10 +1653,10 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
     if locals_ is None:
         sys.modules['__main__'] = ModuleType('__main__')
         locals_ = sys.modules['__main__'].__dict__
-    interpreter = Interpreter(locals_, getpreferredencoding())
+    interpreter = repl.Interpreter(locals_, getpreferredencoding())
 
-    repl = CLIRepl(main_win, interpreter, statusbar, config, idle)
-    repl._C = cols
+    clirepl = CLIRepl(main_win, interpreter, statusbar, config, idle)
+    clirepl._C = cols
 
     sys.stdin = FakeStdin(repl)
     sys.stdout = repl
@@ -1652,18 +1666,18 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
         bpython.args.exec_code(interpreter, args)
         if not interactive:
             curses.raw(False)
-            return repl.getstdout()
+            return clirepl.getstdout()
     else:
         sys.path.insert(0, '')
-        repl.startup()
+        clirepl.startup()
 
     if banner is not None:
-        repl.write(banner)
-        repl.write('\n')
-    repl.repl()
+        clirepl.write(banner)
+        clirepl.write('\n')
+    clirepl.repl()
     if config.hist_length:
         histfilename = os.path.expanduser(config.hist_file)
-        repl.rl_history.save(histfilename, getpreferredencoding())
+        clirepl.rl_history.save(histfilename, getpreferredencoding())
 
     main_win.erase()
     main_win.refresh()
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -140,14 +140,11 @@ class Statusbar(gtk.Statusbar):
     def __init__(self):
         gtk.Statusbar.__init__(self)
         
-        self.context_id = self.get_context_id('StatusBar')
+        self.context_id = self.get_context_id('Statusbar')
 
     def message(self, s, n=3):
         self.push(self.context_id, s)
 
-    def prompt(self, s):
-        pass
-
 
 class SuggestionWindow(gtk.Window):
     """
@@ -267,6 +264,20 @@ def update_matches(self, matches):
         self.view.set_property('visible', bool(matches))
 
 
+class GTKInteraction(repl.Interaction):
+    def __init__(self, config, statusbar):
+        repl.Interaction.__init__(self, config, statusbar)
+
+    def confirm(self, q):
+        dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_INFO, gtk.BUTTONS_YES_NO, q)
+        response = True if dialog.run() == gtk.RESPONSE_YES else False
+        dialog.destroy()
+        return response
+
+    def notify(self, s, n=10):
+        self.statusbar.message(s)
+        
+
 class ReplWidget(gtk.TextView, repl.Repl):
     __gsignals__ = dict(button_press_event=None,
                         focus_in_event=None,
@@ -290,7 +301,7 @@ def __init__(self, interpreter, config):
         self.modify_base('normal', gtk.gdk.color_parse(_COLORS[self.config.color_gtk_scheme['background']]))
 
         self.text_buffer = self.get_buffer()
-        self.statusbar = Statusbar()
+        self.interact = GTKInteraction(self.config, Statusbar())
         tags = dict()
         for (name, value) in self.config.color_gtk_scheme.iteritems():
             tag = tags[name] = self.text_buffer.create_tag(name)
@@ -574,12 +585,6 @@ def on_suggestion_selection_changed(self, selection, word):
             self.text_buffer.insert_at_cursor(word)
 
    
-    def ask_confirmation(self, q):
-        dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_INFO, gtk.BUTTONS_YES_NO, q)
-        response = True if dialog.run() == gtk.RESPONSE_YES else False
-        dialog.destroy()
-        return response
-
     def do_paste(self, widget):
         self.pastebin()
 
@@ -772,7 +777,7 @@ def main(args=None):
     sw.add(repl_widget)
     container.add(sw)
 
-    sb = repl_widget.statusbar
+    sb = repl_widget.interact.statusbar
     container.pack_end(sb, expand=False)
 
     parent.show_all()
@@ -788,7 +793,6 @@ def main(args=None):
             repl_widget.rl_history.save(histfilename, getpreferredencoding())
     return 0
 
-
 if __name__ == '__main__':
     from bpython.gtk_ import main
     main()
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -236,6 +236,23 @@ def update(self, current_word='', matches=[]):
             self.index = -1
 
 
+class Interaction(object):
+    def __init__(self, config, statusbar=None):
+        self.config = config
+
+        if statusbar:
+            self.statusbar = statusbar
+
+    def confirm(self, s):
+        raise NotImplementedError
+
+    def notify(self, s, n=10):
+        raise NotImplementedError
+
+    def file_prompt(self, s):
+        raise NotImplementedError
+
+
 class Repl(object):
     """Implements the necessary guff for a Python-repl-alike interface
 
@@ -302,6 +319,7 @@ def __init__(self, interp, config):
         self.list_win_visible = False
         self._C = {}
         self.prev_block_finished = 0
+        self.interact = Interaction(self.config)
         # previous pastebin content to prevent duplicate pastes, filled on call
         # to repl.pastebin
         self.prev_pastebin_content = ''
@@ -615,9 +633,9 @@ def write2file(self):
         buffer to disk."""
 
         try:
-            fn = self.statusbar.prompt('Save to file (Esc to cancel): ')
+            fn = self.interact.file_prompt('Save to file (Esc to cancel): ')
         except ValueError:
-            self.statusbar.message("Save cancelled.")
+            self.interact.notify("Save cancelled.")
             return
 
         if fn.startswith('~'):
@@ -630,9 +648,9 @@ def write2file(self):
             f.write(s)
             f.close()
         except IOError:
-            self.statusbar.message("Disk write error for file '%s'." % (fn, ))
+            self.interact.notify("Disk write error for file '%s'." % (fn, ))
         else:
-            self.statusbar.message('Saved to %s' % (fn, ))
+            self.interact.notify('Saved to %s' % (fn, ))
 
     def pastebin(self, s=None):
         """Upload to a pastebin and display the URL in the status bar."""
@@ -641,31 +659,31 @@ def pastebin(self, s=None):
             s = self.getstdout()
 
         if (self.config.pastebin_confirm and
-            not self.ask_confirmation("Pastebin buffer? (y/N) ")):
-            self.statusbar.message("Pastebin aborted")
+            not self.interact.confirm("Pastebin buffer? (y/N) ")):
+            self.interact.notify("Pastebin aborted")
             return
 
         pasteservice = ServerProxy(self.config.pastebin_url)
 
         if s == self.prev_pastebin_content:
-            self.statusbar.message('Duplicate pastebin. Previous URL: ' +
-                                    self.prev_pastebin_url)
+            self.interact.notify('Duplicate pastebin. Previous URL: ' +
+                                  self.prev_pastebin_url)
             return
 
         self.prev_pastebin_content = s
 
-        self.statusbar.message('Posting data to pastebin...')
+        self.interact.notify('Posting data to pastebin...')
         try:
             paste_id = pasteservice.pastes.newPaste('pycon', s)
         except XMLRPCError, e:
-            self.statusbar.message('Upload failed: %s' % (str(e), ) )
+            self.interact.notify('Upload failed: %s' % (str(e), ) )
             return
 
         paste_url_template = Template(self.config.pastebin_show_url)
         paste_id = urlquote(paste_id)
         paste_url = paste_url_template.safe_substitute(paste_id=paste_id)
         self.prev_pastebin_url = paste_url
-        self.statusbar.message('Pastebin URL: %s' % (paste_url, ), 10)
+        self.interact.notify('Pastebin URL: %s' % (paste_url, ), 10)
 
     def push(self, s, insert_into_history=True):
         """Push a line of code onto the buffer so it can process it all
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -384,6 +384,17 @@ def render(self, size, focus=False):
         canvas.cursor = cursor
         return canvas
 
+class URWIDInteraction(repl.Interaction):
+    def __init__(self, config, statusbar=None):
+        repl.Interaction.__init__(self, config, statusbar)
+
+    def confirm(self, q):
+        """Ask for yes or no and return boolean"""
+        return self.statusbar.prompt(q).lower().startswith('y')
+ 
+    def notify(self, s, n=10):
+        return self.statusbar.message(s, n)
+
 
 class URWIDRepl(repl.Repl):
 
@@ -400,6 +411,8 @@ def __init__(self, event_loop, palette, interpreter, config):
              config.pastebin_key, config.last_output_key,
              config.show_source_key))
 
+        self.interact = URWIDInteraction(self.config, self.statusbar)
+
         self.tooltip = urwid.ListBox(urwid.SimpleListWalker([]))
         self.tooltip.grid = None
         self.overlay = Tooltip(self.listbox, self.tooltip)
