diff options
| author | QMK Bot <hello@qmk.fm> | 2021-06-24 02:27:20 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-06-24 02:27:20 +0000 |
| commit | 53ca79b922a2028a345ca30f3b1b66531a66ad5b (patch) | |
| tree | 9972c5b4dedeb33bcff698570673912d22d3166b | |
| parent | 7313fee181ee14d05b8c89f33184196d8010c9bb (diff) | |
| parent | d45a24a9546fec52998c66c68a5b3a4306f50199 (diff) | |
| download | qmk_firmware-53ca79b922a2028a345ca30f3b1b66531a66ad5b.tar.gz qmk_firmware-53ca79b922a2028a345ca30f3b1b66531a66ad5b.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rwxr-xr-x | keyboards/ergodox_ez/util/keymap_beautifier/KeymapBeautifier.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/keyboards/ergodox_ez/util/keymap_beautifier/KeymapBeautifier.py b/keyboards/ergodox_ez/util/keymap_beautifier/KeymapBeautifier.py index 6b6f391ce5..f55bdaf2d7 100755 --- a/keyboards/ergodox_ez/util/keymap_beautifier/KeymapBeautifier.py +++ b/keyboards/ergodox_ez/util/keymap_beautifier/KeymapBeautifier.py @@ -164,7 +164,16 @@ class KeymapBeautifier: key_symbols = [key_symbols[i] for i in self.index_conversion_map_reversed(self.INDEX_CONVERSTION_LAYOUT_ergodox_pretty_to_LAYOUT_ergodox)] padded_key_symbols = self.pad_key_symbols(key_symbols, input_layout) - current_pretty_output_layer = self.pretty_output_layer(layer.name[0].value, padded_key_symbols) + + layer_identifier = None + if hasattr(layer.name[0], "value"): + layer_identifier = layer.name[0].value + elif hasattr(layer.name[0], "name"): + layer_identifier = layer.name[0].name + else: + raise AttributeError("Layer is missing both index and name (e.g., [BASE] = LAYOUT_ergodox(...))") + + current_pretty_output_layer = self.pretty_output_layer(layer_identifier, padded_key_symbols) # strip trailing spaces from padding layer_output.append(re.sub(r" +\n", "\n", current_pretty_output_layer)) |