From 60d70705063266ed23b1e86d11145770087f660f Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Fri, 17 Feb 2023 13:45:50 -0500
Subject: [PATCH] Cleanup for current pylint.

---
 make_dungeon.py           | 13 ++++++++-----
 make_graph.py             |  4 +++-
 tests/coverage_dungeon.py | 10 ++++++----
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/make_dungeon.py b/make_dungeon.py
index f90ad32..26d65f6 100755
--- a/make_dungeon.py
+++ b/make_dungeon.py
@@ -10,6 +10,9 @@ playermove().
 Copyright (c) 2017 by Eric S. Raymond
 SPDX-License-Identifier: BSD-2-clause
 """
+
+# pylint: disable=consider-using-f-string
+
 import sys, yaml
 
 YAML_NAME = "adventure.yaml"
@@ -524,7 +527,7 @@ def get_travel(travel):
     return out
 
 if __name__ == "__main__":
-    with open(YAML_NAME, "r") as f:
+    with open(YAML_NAME, "r", encoding='ascii', errors='surrogateescape') as f:
         db = yaml.safe_load(f)
 
     locnames = [x[0] for x in db["locations"]]
@@ -536,10 +539,10 @@ if __name__ == "__main__":
                                  db["objects"])
     ignore = ""
     try:
-        with open(H_TEMPLATE_PATH, "r") as htf:
+        with open(H_TEMPLATE_PATH, "r", encoding='ascii', errors='surrogateescape') as htf:
             # read in dungeon.h template
             h_template = DONOTEDIT_COMMENT + htf.read()
-        with open(C_TEMPLATE_PATH, "r") as ctf:
+        with open(C_TEMPLATE_PATH, "r", encoding='ascii', errors='surrogateescape') as ctf:
             # read in dungeon.c template
             c_template = DONOTEDIT_COMMENT + ctf.read()
     except IOError as e:
@@ -587,10 +590,10 @@ if __name__ == "__main__":
         state_definitions  = statedefines
     )
 
-    with open(H_NAME, "w") as hf:
+    with open(H_NAME, "w", encoding='ascii', errors='surrogateescape') as hf:
         hf.write(h)
 
-    with open(C_NAME, "w") as cf:
+    with open(C_NAME, "w", encoding='ascii', errors='surrogateescape') as cf:
         cf.write(c)
 
 # end
diff --git a/make_graph.py b/make_graph.py
index 82b86af..16ebcba 100755
--- a/make_graph.py
+++ b/make_graph.py
@@ -14,6 +14,8 @@ Make a DOT graph of Colossal Cave.
 # Copyright (c) 2017 by Eric S. Raymond
 # SPDX-License-Identifier: BSD-2-clause
 
+# pylint: disable=consider-using-f-string
+
 import sys, getopt, yaml
 
 def allalike(loc):
@@ -104,7 +106,7 @@ def reveal(objname):
     return not obj.get("immovable")
 
 if __name__ == "__main__":
-    with open("adventure.yaml", "r") as f:
+    with open("adventure.yaml", "r", encoding='ascii', errors='surrogateescape') as f:
         db = yaml.safe_load(f)
 
     location_lookup = dict(db["locations"])
diff --git a/tests/coverage_dungeon.py b/tests/coverage_dungeon.py
index 8bb1c46..bbab99b 100755
--- a/tests/coverage_dungeon.py
+++ b/tests/coverage_dungeon.py
@@ -12,6 +12,8 @@ even if the checkfile search doesn't find them. Typically this will because
 they emit a templated message that can't be regression-tested by equality.
 """
 
+# pylint: disable=consider-using-f-string
+
 import os
 import sys
 import re
@@ -197,7 +199,7 @@ def coverage_report(db, check_file_contents):
 if __name__ == "__main__":
     # load DB
     try:
-        with open(YAML_PATH, "r") as f:
+        with open(YAML_PATH, "r", encoding='ascii', errors='surrogateescape') as f:
             db = yaml.safe_load(f)
     except IOError as e:
         print('ERROR: could not load %s (%s)' % (YAML_PATH, e.strerror))
@@ -207,7 +209,7 @@ if __name__ == "__main__":
     check_file_contents = []
     for filename in os.listdir(TEST_DIR):
         if filename.endswith(".chk"):
-            with open(filename, "r") as f:
+            with open(filename, "r", encoding='ascii', errors='surrogateescape') as f:
                 check_file_contents.append(f.read())
 
     # run coverage analysis report on dungeon database
@@ -254,7 +256,7 @@ if __name__ == "__main__":
 
     # render HTML report
     try:
-        with open(HTML_TEMPLATE_PATH, "r") as f:
+        with open(HTML_TEMPLATE_PATH, "r", encoding='ascii', errors='surrogateescape') as f:
             # read in HTML template
             html_template = f.read()
     except IOError as e:
@@ -263,7 +265,7 @@ if __name__ == "__main__":
 
     # parse template with report and write it out
     try:
-        with open(html_output_path, "w") as f:
+        with open(html_output_path, "w", encoding='ascii', errors='surrogateescape') as f:
             f.write(html_template.format(categories=categories_html, summary=summary_html))
     except IOError as e:
         print('ERROR: writing HTML report failed ({})'.format(e.strerror))
-- 
2.31.1