merge with upstream

Łukasz Langa · Łukasz Langa · commit 3f737f5511a2 · 2010-02-02T17:17:57.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
@@ -339,8 +339,9 @@ def clear_current_line(self):
     def clear_wrapped_lines(self):
         """Clear the wrapped lines of the current input."""
         # curses does not handle this on its own. Sad.
-        width = self.scr.getmaxyx()[1]
-        for y in xrange(self.iy + 1, self.iy + len(self.s) // width + 1):
+        height, width = self.scr.getmaxyx()
+        max_y = min(self.iy + (self.ix + len(self.s)) // width + 1, height)
+        for y in xrange(self.iy + 1, max_y):
             self.scr.move(y, 0)
             self.scr.clrtoeol()
 
@@ -478,12 +479,7 @@ def fwd(self):
         """Same as back() but, well, forward"""
 
         self.cpos = 0
-
-        width = self.scr.getmaxyx()[1]
-        for y in xrange(self.iy + 1, self.iy + len(self.s) // width + 1):
-            self.scr.move(y, 0)
-            self.scr.clrtoeol()
-
+        self.clear_wrapped_lines()
         self.rl_history.enter(self.s)
         self.s = self.rl_history.forward()
         self.print_line(self.s, clr=True)
@@ -1215,8 +1211,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"""
@@ -1394,7 +1390,7 @@ def init_wins(scr, colors, config):
 # This should show to be configured keys from ~/.bpython/config
 #
     statusbar = Statusbar(scr, main_win, background, config,
-        " <%s> Rewind  <%s> Save  <%s> Pastebin  <%s> Pager <%s> Show Source " %
+        " <%s> Rewind  <%s> Save  <%s> Pastebin  <%s> Pager  <%s> Show Source " %
             (config.undo_key, config.save_key,
              config.pastebin_key, config.last_output_key,
              config.show_source_key),
diff --git a/bpython/config.py b/bpython/config.py
@@ -45,6 +45,8 @@ def loadini(struct, configfile):
             'paste_time': 0.02,
             'syntax': True,
             'tab_length': 4,
+            'pastebin_confirm': True,
+            'pastebin_private': False,
             'pastebin_url': 'http://bpaste.net/xmlrpc/',
             'pastebin_show_url': 'http://bpaste.net/show/$paste_id/',
         },
@@ -92,6 +94,8 @@ def loadini(struct, configfile):
     struct.exit_key = config.get('keyboard', 'exit')
     struct.last_output_key = config.get('keyboard', 'last_output')
 
+    struct.pastebin_confirm = config.getboolean('general', 'pastebin_confirm')
+    struct.pastebin_private = config.getboolean('general', 'pastebin_private')
     struct.pastebin_url = config.get('general', 'pastebin_url')
     struct.pastebin_show_url = config.get('general', 'pastebin_show_url')
 
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -46,6 +46,16 @@
 from bpython import importcompletion, inspection
 from bpython.formatter import Parenthesis
 
+# Needed for special handling of __abstractmethods__
+# abc only exists since 2.6, so check both that it exists and that it's
+# the one we're expecting
+try:
+    import abc
+    abc.ABCMeta
+    has_abc = True
+except (ImportError, AttributeError):
+    has_abc = False
+
 py3 = sys.version_info[0] == 3
 
 
@@ -339,6 +349,11 @@ def attr_lookup(self, obj, expr, attr):
         if hasattr(obj, '__class__'):
             words.append('__class__')
             words = words + rlcompleter.get_class_members(obj.__class__)
+            if has_abc and not isinstance(obj.__class__, abc.ABCMeta):
+                try:
+                    words.remove('__abstractmethods__')
+                except ValueError:
+                    pass
 
         matches = []
         n = len(attr)
@@ -625,6 +640,13 @@ def write2file(self):
     def pastebin(self):
         """Upload to a pastebin and display the URL in the status bar."""
 
+        if (self.config.pastebin_confirm and
+            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()
