Check colors in custom theme config and error out on unknown codes

sebastinas · sebastinas · commit f924f2c7867e · 2021-01-30T09:47:29.000+01:00
diff --git a/bpython/config.py b/bpython/config.py
@@ -31,10 +31,17 @@
 from xdg import BaseDirectory
 
 from .autocomplete import AutocompleteModes
+from .curtsiesfrontend.parse import CNAMES
 
 default_completion = AutocompleteModes.SIMPLE
 
 
+class UnknownColorCode(Exception):
+    def __init__(self, key, color):
+        self.key = key
+        self.color = color
+
+
 class Struct:
     """Simple class for instantiating objects we can add arbitrary attributes
     to and use for various arbitrary things."""
@@ -324,6 +331,11 @@ def get_key_no_doublebind(command):
                 f"Could not load theme '{color_scheme_name}' from {path}.\n"
             )
             sys.exit(1)
+        except UnknownColorCode as ucc:
+            sys.stderr.write(
+                f"Theme '{color_scheme_name}' contains invalid color: {ucc.key} = {ucc.color}.\n"
+            )
+            sys.exit(1)
 
     # expand path of history file
     struct.hist_file = Path(struct.hist_file).expanduser()
@@ -362,6 +374,8 @@ def load_theme(struct, path, colors, default_colors):
             colors[k] = theme.get("syntax", k)
         else:
             colors[k] = theme.get("interface", k)
+        if colors[k].lower() not in CNAMES:
+            raise UnknownColorCode(k, colors[k])
 
     # Check against default theme to see if all values are defined
     for k, v in default_colors.items():
