summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-03-19 20:59:03 +0000
committerQMK Bot <hello@qmk.fm>2022-03-19 20:59:03 +0000
commit729d7c2b2e627a1c2f6bfc23a17f9bdab17eb2af (patch)
tree432ef2af0e5c231402e1497c81246122abf71333
parent223bc47658da16abbad02c997ed35c841672b196 (diff)
parent2f095b8925df98cf2c8c818c8fc44a9015efd6be (diff)
downloadqmk_firmware-729d7c2b2e627a1c2f6bfc23a17f9bdab17eb2af.tar.gz
qmk_firmware-729d7c2b2e627a1c2f6bfc23a17f9bdab17eb2af.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--lib/python/qmk/path.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/python/qmk/path.py b/lib/python/qmk/path.py
index 9b94abbc12..556d0eefc8 100644
--- a/lib/python/qmk/path.py
+++ b/lib/python/qmk/path.py
@@ -70,9 +70,11 @@ def normpath(path):
class FileType(argparse.FileType):
- def __init__(self, encoding='UTF-8'):
+ def __init__(self, *args, **kwargs):
# Use UTF8 by default for stdin
- return super().__init__(encoding=encoding)
+ if 'encoding' not in kwargs:
+ kwargs['encoding'] = 'UTF-8'
+ return super().__init__(*args, **kwargs)
def __call__(self, string):
"""normalize and check exists