From 5f89c17ec656353d88beede4ac362ff297321037 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 16 Dec 2023 14:07:05 -0500
Subject: [PATCH] Fix some python scripts for translations and skeleton

---
 scripts/code_tools/modified_strings.py | 6 +++---
 scripts/content_tools/skel_tool.py     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/code_tools/modified_strings.py b/scripts/code_tools/modified_strings.py
index e7a9d239dc7..a9072fccb43 100644
--- a/scripts/code_tools/modified_strings.py
+++ b/scripts/code_tools/modified_strings.py
@@ -315,7 +315,7 @@ def save_translation_file(per_lang_data, aux_data, outfile):
         worksheet.set_column('B:B', 80, wrap_format)
         
     print("Writing", outfile)
-    writer.save()
+    writer.close()
 
 if __name__ == "__main__":
 
@@ -325,7 +325,7 @@ def save_translation_file(per_lang_data, aux_data, outfile):
     parser.add_argument("--deleted", action="store_true", default = False, help="show all translated entities which don't exist in english")
     parser.add_argument("--skip_spreadsheet", action="store_true", default = False, help="skip creating the translation spreadsheet")
     parser.add_argument("--rev", help="revision with modified strings, default HEAD", default="HEAD")
-    parser.add_argument("--rev_base", help="previous revision to compare against, default master", default="master")
+    parser.add_argument("--rev_base", help="previous revision to compare against, default main", default="main")
     parser.add_argument("--base_lang", help="base language, default en (normally leave unchanged - other values are only useful for testing)", default="en")
     parser.add_argument("--lang", help="target languages, or 'all_valid' or 'supported'; default is 'supported'", nargs="+", default = ["supported"])
     args = parser.parse_args()
@@ -397,7 +397,7 @@ def save_translation_file(per_lang_data, aux_data, outfile):
     if args.deleted:
         deletion_file = "Translate_deletions.txt"
         print("Saving deletion info to", deletion_file)
-        with open(deletion_file,"w") as f:
+        with open(deletion_file,"w", encoding="utf-8") as f:
             for lang in langs:
                 find_deletions(mod_tree, base_tree, lang, args, f)
 
diff --git a/scripts/content_tools/skel_tool.py b/scripts/content_tools/skel_tool.py
index 696e4e29238..3ed6ebf7c08 100644
--- a/scripts/content_tools/skel_tool.py
+++ b/scripts/content_tools/skel_tool.py
@@ -83,10 +83,10 @@ def enforce_alias_rules(tree, element, fix=False):
     if name:
         std_alias = "avatar_" + name
         if not std_alias in alias_lis:
-            print "missing expected alias",name,std_alias
+            print("missing expected alias",name,std_alias)
         for alias in alias_lis:
             if alias.startswith("avatar_") and alias != std_alias:
-                print "invalid avatar_ alias",name,alias
+                print("invalid avatar_ alias",name,alias)
 
 def enforce_symmetry(tree, element, field, fix=False):
     name = element.get("name")
-- 
GitLab