Complete magic methods within a class body (configurable).

Julian Berman · Julian Berman · commit 8ce719c5912b · 2011-11-21T22:16:12.000-05:00
diff --git a/bpython/config.py b/bpython/config.py
@@ -6,6 +6,15 @@
 from bpython.keys import cli_key_dispatch as key_dispatch
 
 
+MAGIC_METHODS = ", ".join("__%s__" % s for s in [
+    "init", "repr", "str", "lt", "le", "eq", "ne", "gt", "ge", "cmp", "hash",
+    "nonzero", "unicode", "getattr", "setattr", "get", "set","call", "len",
+    "getitem", "setitem", "iter", "reversed", "contains", "add", "sub", "mul",
+    "floordiv", "mod", "divmod", "pow", "lshift", "rshift", "and", "xor", "or",
+    "div", "truediv", "neg", "pos", "abs", "invert", "complex", "int", "float",
+    "oct", "hex", "index", "coerce", "enter", "exit"]
+)
+
 class Struct(object):
     """Simple class for instantiating objects we can add arbitrary attributes
     to and use for various arbitrary things."""
@@ -45,6 +54,8 @@ def loadini(struct, configfile):
             'arg_spec': True,
             'auto_display_list': True,
             'color_scheme': 'default',
+            'complete_magic_methods' : True,
+            'magic_methods' : MAGIC_METHODS,
             'dedent_after': 1,
             'flush_output': True,
             'highlight_show_source': True,
@@ -124,6 +135,11 @@ def loadini(struct, configfile):
     struct.cli_suggestion_width = config.getfloat('cli',
                                                   'suggestion_width')
 
+    struct.complete_magic_methods = config.getboolean('general',
+                                                      'complete_magic_methods')
+    methods = config.get('general', 'magic_methods')
+    struct.magic_methods = [meth.strip() for meth in methods.split(",")]
+
     struct.gtk_font = config.get('gtk', 'font')
 
     color_scheme_name = config.get('general', 'color_scheme')
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -617,6 +617,11 @@ def complete(self, tab=False):
                 e = True
             else:
                 matches = self.completer.matches
+                if (self.config.complete_magic_methods and self.buffer and
+                    self.buffer[0].startswith("class ") and
+                    self.current_line().lstrip().startswith("def ")):
+                    matches.extend(name for name in self.config.magic_methods
+                                   if name.startswith(cw))
 
         if not e and self.argspec:
             matches.extend(name + '=' for name in self.argspec[1][0]
