commit 31fdddd89bff254f76891e7cfd12f8cfd6750c31
author Mike Frysinger <vapier@chromium.org> Fri Feb 24 15:50:55 2023 -0500
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Feb 27 16:57:47 2023 +0000
tree ca7b5050c40761856233416f94abd01dfbd902fb
parent 961de62d91fd72fdb9a68b2c3b676dea14c10c7f

scripts: update open calls to use explicit encoding

BUG=b:187789896
TEST=`cros lint` is clean here

Change-Id: Ia54475869c17292505537334362cd4cff6438b14
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4290041
Commit-Queue: Cindy Lin <xcl@google.com>
Reviewed-by: Cindy Lin <xcl@google.com>
Tested-by: Mike Frysinger <vapier@chromium.org>
Auto-Submit: Mike Frysinger <vapier@chromium.org>

scripts/sysmon/git_metrics_unittest.py

diff --git a/scripts/sysmon/git_metrics_unittest.py b/scripts/sysmon/git_metrics_unittest.py
index 7915e48..bff7789 100644
--- a/scripts/sysmon/git_metrics_unittest.py
+++ b/scripts/sysmon/git_metrics_unittest.py
@@ -95,8 +95,7 @@
             call(["git", "init"])
             call(["git", "config", "user.name", "John Doe"])
             call(["git", "config", "user.email", "john@example.com"])
-            with open("foo", "w") as f:
-                f.write("a\nb\nc\n")
+            osutils.WriteFile("foo", "a\nb\nc\n")
             call(["git", "add", "foo"])
             env = os.environ.copy()
             env["GIT_AUTHOR_DATE"] = "2017-01-01T00:00:00Z"
@@ -117,8 +116,7 @@
 
     def test_get_unstaged_changes(self):
         """Test get_unstaged_changes()."""
-        with open(os.path.join(self.tempdir, "spam"), "w") as f:
-            f.write("a\n")
+        (self.tempdir / "spam").write_text("a\n", encoding="utf-8")
         os.remove(os.path.join(self.tempdir, "foo"))
         repo = git_metrics._GitRepo(self.git_dir)
         added, removed = repo.get_unstaged_changes()

scripts/sysmon/puppet_metrics.py

diff --git a/scripts/sysmon/puppet_metrics.py b/scripts/sysmon/puppet_metrics.py
index 5eb90fa..9bb35cc 100644
--- a/scripts/sysmon/puppet_metrics.py
+++ b/scripts/sysmon/puppet_metrics.py
@@ -105,7 +105,7 @@
 def collect_puppet_summary():
     """Send Puppet run summary metrics."""
     try:
-        with open(LAST_RUN_FILE) as f:
+        with open(LAST_RUN_FILE, encoding="utf-8") as f:
             summary = _PuppetRunSummary(f)
     except Exception as e:
         logger.warning("Error loading Puppet run summary: %s", e)

scripts/sysmon/puppet_metrics_unittest.py

diff --git a/scripts/sysmon/puppet_metrics_unittest.py b/scripts/sysmon/puppet_metrics_unittest.py
index b90b0b3..c1d933c 100644
--- a/scripts/sysmon/puppet_metrics_unittest.py
+++ b/scripts/sysmon/puppet_metrics_unittest.py
@@ -13,6 +13,7 @@
 from unittest import mock
 
 from chromite.lib import cros_test_lib
+from chromite.lib import osutils
 from chromite.scripts.sysmon import puppet_metrics
 
 
@@ -128,8 +129,7 @@
         self.tempfile = os.path.join(self.tempdir, "last_run_summary.yaml")
 
     def test_collect(self):
-        with open(self.tempfile, "w") as f:
-            f.write(_SUMMARY)
+        osutils.WriteFile(self.tempfile, _SUMMARY)
         with mock.patch("time.time", return_value=1500000000):
             with mock.patch.object(
                 puppet_metrics, "LAST_RUN_FILE", self.tempfile