diff options
| author | Zach White <skullydazed@gmail.com> | 2021-01-03 15:45:06 -0800 |
|---|---|---|
| committer | Zach White <skullydazed@drpepper.org> | 2021-01-03 17:55:54 -0800 |
| commit | 6daa204363dfaa7f31d935a9913d6b35ec22e971 (patch) | |
| tree | f7f55b5b2dbc39ac03d5839199ee6a6554142dac | |
| parent | 5b2feecdf3755fce58d8b04c45dae0aec9c5cd1b (diff) | |
fix keyboards with apostrophes in their names
| -rwxr-xr-x | lib/python/qmk/cli/generate/config_h.py | 4 | ||||
| -rw-r--r-- | lib/python/qmk/info.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py index e160ffea83..09aa0041f4 100755 --- a/lib/python/qmk/cli/generate/config_h.py +++ b/lib/python/qmk/cli/generate/config_h.py @@ -45,7 +45,7 @@ def keyboard_name(keyboard_name): #ifndef PRODUCT # define PRODUCT %s #endif // PRODUCT -""" % (keyboard_name, keyboard_name) +""" % (keyboard_name.replace("'", ""), keyboard_name.replace("'", "")) def manufacturer(manufacturer): @@ -55,7 +55,7 @@ def manufacturer(manufacturer): #ifndef MANUFACTURER # define MANUFACTURER %s #endif // MANUFACTURER -""" % (manufacturer) +""" % (manufacturer.replace("'", "")) def direct_pins(direct_pins): diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 2954a17e09..4611874e85 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -345,7 +345,7 @@ def _merge_layouts(info_data, new_info_data): else: # Pull in layouts that have matrix data missing_matrix = False - for key in layout_json['layout']: + for key in layout_json.get('layout', {}): if 'matrix' not in key: missing_matrix = True |