Merge in main branch, pastebin confirmation

ikanobori · ikanobori · commit 08be789794ef · 2010-01-21T10:58:23.000+01:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+v0.9.7
+------
+
+* Pastebin confirmation added; we were getting a lot of people accidentally
+  pastebinning sensitive information so I think this is a good idea.
+
 v0.9.6.2
 --------
 Unfortunately another bugfix release as I (Bob) broke py3 support.
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1218,8 +1218,8 @@ def undo(self, n=1):
 
     def writetb(self, lines):
         for line in lines:
-            self.echo('\x01%s\x03%s' % (self.config.color_scheme['error'],
-                                        line))
+            self.write('\x01%s\x03%s' % (self.config.color_scheme['error'],
+                                         line))
 
     def yank_from_buffer(self):
         """Paste the text from the cut buffer at the current cursor location"""
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -625,6 +625,12 @@ def write2file(self):
     def pastebin(self):
         """Upload to a pastebin and display the URL in the status bar."""
 
+        if not self.statusbar.prompt("Pastebin buffer? (y/N) "
+            ).lower().startswith('y'
+            ):
+            self.statusbar.message("Pastebin aborted")
+            return
+
         pasteservice = ServerProxy(self.config.pastebin_url)
 
         s = self.getstdout()
