Merge pull request #1065 from benoit-pierre/fix_config_keymap_validation

config: fix keymap validation
openstenoproject · Apr 30, 2019 · d4ace92 · d4ace92
2 parents e8ba565 + c873f2b
commit d4ace92
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/plover/config.py b/plover/config.py
@@ -244,8 +244,8 @@ def setter(config, key, keymap):
     def validate(config, key, value):
         try:
             return build_keymap(config, key, value)
-        except ValueError as e:
-            raise InvalidConfigOption(value, default(config, machine_type, system_name)) from e
+        except (TypeError, ValueError) as e:
+            raise InvalidConfigOption(value, default(config, key)) from e
     return ConfigOption('system_keymap', default, getter, setter, validate, full_key)
 
 def dictionaries_option():

diff --git a/test/test_config.py b/test/test_config.py
@@ -337,6 +337,28 @@ def test_config_dict():
      '''
     ),
 
+    ('invalid_keymap_1',
+     '''
+     [System: English Stenotype]
+     keymap[keyboard] = [["_-"]]
+     ''',
+     DEFAULTS,
+     {},
+     {},
+     None,
+    ),
+
+    ('invalid_keymap_2',
+     '''
+     [System: English Stenotype]
+     keymap[keyboard] = 42
+     ''',
+     DEFAULTS,
+     {},
+     {},
+     None,
+    ),
+
     ('invalid_options_1',
      '''
      [System]