From 5b3dc8d5ed4d73d5fa7bb8028d467a923dfbd191 Mon Sep 17 00:00:00 2001 From: Autissima Date: Wed, 3 Sep 2025 22:41:10 +0200 Subject: Python script encoding fix (#1093) * Changed Python scripts so they work on my machine file open() used default encoding (cp1252 on my machine) but the text is utf-8, had to specify encoding in check_layout.py --- check_layout.py | 4 ++-- gen_layouts.py | 6 +++--- res/values/layouts.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/check_layout.py b/check_layout.py index 0208a97..5f90927 100644 --- a/check_layout.py +++ b/check_layout.py @@ -116,7 +116,7 @@ def check_layout(layout): # Fill 'known_keys', which is used for some checks def parse_known_keys(): global known_keys - with open("srcs/juloo.keyboard2/KeyValue.java", "r") as f: + with open("srcs/juloo.keyboard2/KeyValue.java", "r", encoding="utf-8") as f: known_keys = set( ( m.group(1) for m in re.finditer('case "([^"]+)":', f.read()) ) ) @@ -134,6 +134,6 @@ for fname in sorted(glob.glob("srcs/layouts/*.xml")): else: check_layout(layout) -with open("check_layout.output", "w") as out: +with open("check_layout.output", "w", encoding="utf-8") as out: for w in warnings: print(w, file=out) diff --git a/gen_layouts.py b/gen_layouts.py index 6cae361..a755844 100644 --- a/gen_layouts.py +++ b/gen_layouts.py @@ -57,8 +57,8 @@ def generate_arrays(out, layouts): root.append(mk_array("string-array", "pref_layout_entries", entries_items)) root.append(mk_array("integer-array", "layout_ids", ids_items)) XML.indent(root) - XML.ElementTree(element=root).write(out, encoding="unicode", xml_declaration=True) + XML.ElementTree(element=root).write(out, encoding="utf-8", xml_declaration=True) layouts = sort_layouts(read_layouts(glob.glob("srcs/layouts/*.xml"))) -with open("res/values/layouts.xml", "w") as out: - generate_arrays(out, layouts) +with open("res/values/layouts.xml", "wb") as out: + generate_arrays(out, layouts) \ No newline at end of file diff --git a/res/values/layouts.xml b/res/values/layouts.xml index 22337f9..d5b0990 100644 --- a/res/values/layouts.xml +++ b/res/values/layouts.xml @@ -1,4 +1,4 @@ - + -- cgit v1.2.3