Verify completion mode

sebastinas · sebastinas · commit 6d7fa191396b · 2015-01-09T08:32:05.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -48,6 +48,8 @@
 SUBSTRING = 'substring'
 FUZZY = 'fuzzy'
 
+ALL_MODES = (SIMPLE, SUBSTRING, FUZZY)
+
 MAGIC_METHODS = ["__%s__" % s for s in [
     "init", "repr", "str", "lt", "le", "eq", "ne", "gt", "ge", "cmp", "hash",
     "nonzero", "unicode", "getattr", "setattr", "get", "set","call", "len",
diff --git a/bpython/config.py b/bpython/config.py
@@ -6,6 +6,8 @@
 from bpython.keys import cli_key_dispatch as key_dispatch
 from bpython.autocomplete import SIMPLE as default_completion
 
+import bpython.autocomplete
+
 class Struct(object):
     """Simple class for instantiating objects we can add arbitrary attributes
     to and use for various arbitrary things."""
@@ -229,8 +231,13 @@ def get_key_no_doublebind(attr, already_used={}):
     for key in (struct.pastebin_key, struct.save_key):
         key_dispatch[key]
 
+    # expand path of history file
     struct.hist_file = os.path.expanduser(struct.hist_file)
 
+    # verify completion mode
+    if struct.autocomplete_mode not in bpython.autocomplete.ALL_MODES:
+        struct.autocomplete_mode = default_completion
+
 def load_theme(struct, path, colors, default_colors):
     theme = ConfigParser()
     with open(path, 'r') as f:
