From 5083c618cfbffb7ce49ef9f02253bfa41b8443ba Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sun, 16 Oct 2022 13:25:48 +1100 Subject: [PATCH] `qmk pytest` --- lib/python/qmk/xap/common.py | 1 - lib/python/qmk/xap/gen_firmware/blob_generator.py | 4 ++-- lib/python/qmk/xap/jinja2_filters.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/python/qmk/xap/common.py b/lib/python/qmk/xap/common.py index 6a58f9eb3a8..b964685e29c 100755 --- a/lib/python/qmk/xap/common.py +++ b/lib/python/qmk/xap/common.py @@ -8,7 +8,6 @@ from pathlib import Path from typing import OrderedDict from jinja2 import Environment, FileSystemLoader, select_autoescape -from qmk.casing import to_snake from qmk.constants import QMK_FIRMWARE, GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE from qmk.git import git_get_version from qmk.json_schema import json_load, validate diff --git a/lib/python/qmk/xap/gen_firmware/blob_generator.py b/lib/python/qmk/xap/gen_firmware/blob_generator.py index 153cedfd8a9..319b1f22ed7 100644 --- a/lib/python/qmk/xap/gen_firmware/blob_generator.py +++ b/lib/python/qmk/xap/gen_firmware/blob_generator.py @@ -57,10 +57,10 @@ def generate_blob(output_file, keyboard, keymap): lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once', ''] - lines.append(f'#if 0') + lines.append('#if 0') lines.append('// Blob contains a minified+gzipped version of the following:') lines.append(json.dumps(info_json, cls=InfoJSONEncoder)) - lines.append(f'#endif') + lines.append('#endif') lines.append('') # Gen output file diff --git a/lib/python/qmk/xap/jinja2_filters.py b/lib/python/qmk/xap/jinja2_filters.py index a525c3e374e..625747dd481 100644 --- a/lib/python/qmk/xap/jinja2_filters.py +++ b/lib/python/qmk/xap/jinja2_filters.py @@ -42,7 +42,7 @@ def _xap_type_to_c_after(xt: str): try: extent = int(m.group(2)) return f'[{extent}]' - except: + except ValueError: return '[]' return ''