monkeypatch rlcompleter's _callable_postfix to prevent side-effects (__getattr__/__getattribute__)

Trundle · Trundle · commit 90520a8846e6 · 2009-06-02T19:12:18.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -301,6 +301,10 @@ def __init__(self, scr, interp, statusbar=None, idle=None):
 # Use the interpreter's namespace only for the readline stuff:
         self.completer = rlcompleter.Completer(self.interp.locals)
         self.completer.attr_matches = self.attr_matches
+        # Gna, Py 2.6's rlcompleter searches for __call__ inside the
+        # instance instead of the type, so we monkeypatch to prevent
+        # side-effects (__getattr__/__getattribute__)
+        self.completer._callable_postfix = self._callable_postfix
         self.statusbar = statusbar
         self.list_win = curses.newwin(1, 1, 1, 1)
         self.idle = idle
@@ -396,6 +400,12 @@ def attr_lookup(self, obj, expr, attr):
                 matches.append("%s.%s" % (expr, word))
         return matches
 
+    def _callable_postfix(self, value, word):
+        """rlcompleter's _callable_postfix done right."""
+        if hasattr(type(value), '__call__'):
+            word += '('
+        return word
+
     def cw(self):
         """Return the current word, i.e. the (incomplete) word directly to the
         left of the cursor"""
