Better pastebin abstractions, thanks for the ideas Andy

ikanobori · ikanobori · commit af0b29a81b4b · 2010-03-31T22:20:22.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python
-#
+
 # The MIT License
 #
 # Copyright (c) 2008 Bob Farrell
@@ -999,6 +998,10 @@ 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."""
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -573,48 +573,15 @@ 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."""
+   
+    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
 
-        # 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 do_paste(self, widget):
+        self.pastebin()
 
     def write(self, s):
         """For overriding stdout defaults"""
@@ -690,8 +657,7 @@ 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):
+    def getstdout(self):
         bounds = self.text_buffer.get_bounds()
         text = self.text_buffer.get_text(bounds[0], bounds[1])
         return text
@@ -773,7 +739,7 @@ def main(args=None):
     filem.set_submenu(filemenu)
       
     pastebin = gtk.MenuItem("Pastebin")
-    pastebin.connect("activate", repl_widget.pastebin)
+    pastebin.connect("activate", repl_widget.do_paste)
     filemenu.append(pastebin)
  
     exit = gtk.MenuItem("Exit")
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -634,20 +634,19 @@ def write2file(self):
         else:
             self.statusbar.message('Saved to %s' % (fn, ))
 
-    def pastebin(self):
+    def pastebin(self, s=None):
         """Upload to a pastebin and display the URL in the status bar."""
 
+        if s is None:
+            s = self.getstdout()
+
         if (self.config.pastebin_confirm and
-            not self.statusbar.prompt("Pastebin buffer? (y/N) "
-            ).lower().startswith('y'
-            )):
+            not self.ask_confirmation("Pastebin buffer? (y/N) ")):
             self.statusbar.message("Pastebin aborted")
             return
 
         pasteservice = ServerProxy(self.config.pastebin_url)
 
-        s = self.getstdout()
-
         if s == self.prev_pastebin_content:
             self.statusbar.message('Duplicate pastebin. Previous URL: ' +
                                     self.prev_pastebin_url)
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -581,7 +581,10 @@ def getstdout(self):
 
         return self.stdout_hist + '\n'
 
-
+    def ask_confirmation(self, q):
+        """Ask for yes or no and return boolean"""
+        return self.statusbar.prompt(q).lower().startswith('y')
+ 
     def reevaluate(self):
         """Clear the buffer, redraw the screen and re-evaluate the history"""
 
