Pastebin + confirmation in GTK, this means:

ikanobori · ikanobori · commit 5b0874091ff4 · 2010-03-31T21:56:06.000+02:00
- moved stdout_hist to repl children (and its methods)
- added statusbar to gtk_.ReplWidget
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -240,6 +240,7 @@ def __init__(self, scr, interp, statusbar, config, idle=None):
         Repl.__init__(self, interp, config)
         interp.writetb = self.writetb
         self.scr = scr
+        self.stdout_hist = ''
         self.list_win = newwin(get_colpair(config, 'background'), 1, 1, 1, 1)
         self.cpos = 0
         self.do_exit = False
@@ -998,6 +999,78 @@ def resize(self):
         self.statusbar.resize(refresh=False)
         self.redraw()
 
+    def getstdout(self):
+        """This method returns the 'spoofed' stdout buffer, for writing to a
+        file or sending to a pastebin or whatever."""
+
+        return self.stdout_hist + '\n'
+
+
+    def reevaluate(self):
+        """Clear the buffer, redraw the screen and re-evaluate the history"""
+
+        self.evaluating = True
+        self.stdout_hist = ''
+        self.f_string = ''
+        self.buffer = []
+        self.scr.erase()
+        self.s_hist = []
+        # Set cursor position to -1 to prevent paren matching
+        self.cpos = -1
+
+        self.prompt(False)
+
+        self.iy, self.ix = self.scr.getyx()
+        for line in self.history:
+            if py3:
+                self.stdout_hist += line + '\n'
+            else:
+                self.stdout_hist += line.encode(getpreferredencoding()) + '\n'
+            self.print_line(line)
+            self.s_hist[-1] += self.f_string
+# I decided it was easier to just do this manually
+# than to make the print_line and history stuff more flexible.
+            self.scr.addstr('\n')
+            more = self.push(line)
+            self.prompt(more)
+            self.iy, self.ix = self.scr.getyx()
+
+        self.cpos = 0
+        indent = next_indentation(self.s, self.config.tab_length)
+        self.s = ''
+        self.scr.refresh()
+
+        if self.buffer:
+            for _ in xrange(indent):
+                self.tab()
+
+        self.evaluating = False
+        #map(self.push, self.history)
+        #^-- That's how simple this method was at first :(
+
+    def write(self, s):
+        """For overriding stdout defaults"""
+        if '\x04' in s:
+            for block in s.split('\x04'):
+                self.write(block)
+            return
+        if s.rstrip() and '\x03' in s:
+            t = s.split('\x03')[1]
+        else:
+            t = s
+
+        if not py3 and isinstance(t, unicode):
+            t = t.encode(getpreferredencoding())
+
+        if not self.stdout_hist:
+            self.stdout_hist = t
+        else:
+            self.stdout_hist += t
+
+        self.echo(s)
+        self.s_hist.append(s.rstrip())
+
+
     def show_list(self, items, topline=None, current_item=None):
         shared = Struct()
         shared.cols = 0
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -33,6 +33,9 @@
 import os
 import sys
 from locale import LC_ALL, getpreferredencoding, setlocale
+from xmlrpclib import ServerProxy, Error as XMLRPCError
+from string import Template
+from urllib import quote as urlquote
 
 import gobject
 import gtk
@@ -42,6 +45,7 @@
 from bpython.formatter import theme_map
 import bpython.args
 
+py3 = sys.version_info[0] == 3
 
 _COLORS = dict(b='blue', c='cyan', g='green', m='magenta', r='red',
                w='white', y='yellow', k='black', d='black')
@@ -136,8 +140,13 @@ class Statusbar(gtk.Statusbar):
     def __init__(self):
         gtk.Statusbar.__init__(self)
         
-        context_id = self.get_context_id('StatusBar')
-        # self.push(context_id, text)
+        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):
@@ -281,6 +290,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()
         tags = dict()
         for (name, value) in self.config.color_gtk_scheme.iteritems():
             tag = tags[name] = self.text_buffer.create_tag(name)
@@ -563,6 +573,68 @@ def on_suggestion_selection_changed(self, selection, word):
                                     self.get_cursor_iter())
             self.text_buffer.insert_at_cursor(word)
 
+    def pastebin(self, widget):
+        """Upload to a pastebin and display the URL in the status bar."""
+
+        # FIXME cleanup
+        response = False
+
+        if self.config.pastebin_confirm:
+            dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_INFO, gtk.BUTTONS_YES_NO,
+                                       "Pastebin buffer?")
+            response = True if dialog.run() == gtk.RESPONSE_YES else False
+            dialog.destroy()
+        else:
+            response = True
+         
+        if not response:
+            self.statusbar.message("Pastebin aborted")
+            return 
+        # end FIXME
+
+        pasteservice = ServerProxy(self.config.pastebin_url)
+
+        s = self.stdout_hist
+
+        if s == self.prev_pastebin_content:
+            self.statusbar.message('Duplicate pastebin. Previous URL: ' +
+                                    self.prev_pastebin_url)
+            return
+
+        self.prev_pastebin_content = s
+
+        self.statusbar.message('Posting data to pastebin...')
+        try:
+            paste_id = pasteservice.pastes.newPaste('pycon', s)
+        except XMLRPCError, e:
+            self.statusbar.message('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)
+
+    def write(self, s):
+        """For overriding stdout defaults"""
+        if '\x04' in s:
+            for block in s.split('\x04'):
+                self.write(block)
+            return
+        if s.rstrip() and '\x03' in s:
+            t = s.split('\x03')[1]
+        else:
+            t = s
+
+        if not py3 and isinstance(t, unicode):
+            t = t.encode(getpreferredencoding())
+
+        self.echo(s)
+        self.s_hist.append(s.rstrip())
+
+
+
     def prompt(self, more):
         """
         Show the appropriate Python prompt.
@@ -618,6 +690,12 @@ def set_cursor_to_valid_insert_position(self):
         if line_start_iter.compare(cursor_iter) > 0:
             self.text_buffer.place_cursor(line_start_iter)
 
+    @property
+    def stdout_hist(self):
+        bounds = self.text_buffer.get_bounds()
+        text = self.text_buffer.get_text(bounds[0], bounds[1])
+        return text
+
     def writetb(self, lines):
         with ExceptionManager(ExceptionDialog,
                               'An error occured while trying to display '
@@ -693,7 +771,11 @@ def main(args=None):
 
     filem = gtk.MenuItem("File")
     filem.set_submenu(filemenu)
-       
+      
+    pastebin = gtk.MenuItem("Pastebin")
+    pastebin.connect("activate", repl_widget.pastebin)
+    filemenu.append(pastebin)
+ 
     exit = gtk.MenuItem("Exit")
     exit.connect("activate", gtk.main_quit)
     filemenu.append(exit)
@@ -711,7 +793,7 @@ def main(args=None):
     sw.add(repl_widget)
     container.add(sw)
 
-    sb = Statusbar()
+    sb = repl_widget.statusbar
     container.pack_end(sb, expand=False)
 
     parent.show_all()
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -284,7 +284,6 @@ def __init__(self, interp, config):
         self.interp.syntaxerror_callback = self.clear_current_line
         self.match = False
         self.rl_history = History()
-        self.stdout_hist = ''
         self.s_hist = []
         self.history = []
         self.evaluating = False
@@ -598,12 +597,6 @@ def next_indentation(self):
             indentation = 0
         return indentation
 
-    def getstdout(self):
-        """This method returns the 'spoofed' stdout buffer, for writing to a
-        file or sending to a pastebin or whatever."""
-
-        return self.stdout_hist + '\n'
-
     def formatforfile(self, s):
         """Format the stdout buffer to something suitable for writing to disk,
         i.e. without >>> and ... at input lines and with "# OUT: " prepended to
@@ -710,70 +703,6 @@ def undo(self, n=1):
 
         self.rl_history.entries = entries
 
-    def reevaluate(self):
-        """Clear the buffer, redraw the screen and re-evaluate the history"""
-
-        self.evaluating = True
-        self.stdout_hist = ''
-        self.f_string = ''
-        self.buffer = []
-        self.scr.erase()
-        self.s_hist = []
-        # Set cursor position to -1 to prevent paren matching
-        self.cpos = -1
-
-        self.prompt(False)
-
-        self.iy, self.ix = self.scr.getyx()
-        for line in self.history:
-            if py3:
-                self.stdout_hist += line + '\n'
-            else:
-                self.stdout_hist += line.encode(getpreferredencoding()) + '\n'
-            self.print_line(line)
-            self.s_hist[-1] += self.f_string
-# I decided it was easier to just do this manually
-# than to make the print_line and history stuff more flexible.
-            self.scr.addstr('\n')
-            more = self.push(line)
-            self.prompt(more)
-            self.iy, self.ix = self.scr.getyx()
-
-        self.cpos = 0
-        indent = next_indentation(self.s, self.config.tab_length)
-        self.s = ''
-        self.scr.refresh()
-
-        if self.buffer:
-            for _ in xrange(indent):
-                self.tab()
-
-        self.evaluating = False
-        #map(self.push, self.history)
-        #^-- That's how simple this method was at first :(
-
-    def write(self, s):
-        """For overriding stdout defaults"""
-        if '\x04' in s:
-            for block in s.split('\x04'):
-                self.write(block)
-            return
-        if s.rstrip() and '\x03' in s:
-            t = s.split('\x03')[1]
-        else:
-            t = s
-
-        if not py3 and isinstance(t, unicode):
-            t = t.encode(getpreferredencoding())
-
-        if not self.stdout_hist:
-            self.stdout_hist = t
-        else:
-            self.stdout_hist += t
-
-        self.echo(s)
-        self.s_hist.append(s.rstrip())
-
     def flush(self):
         """Olivier Grisel brought it to my attention that the logging
         module tries to call this method, since it makes assumptions
diff --git a/bpython/urwid.py b/bpython/urwid.py
