From 97f8225d22ef727ae9935cc231643efdc430d530 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Thu, 14 Mar 2019 09:44:22 -0400 Subject: [PATCH] scripts/check-obsolete-constructs.py: Process all headers as UTF-8. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit A few of our installed headers contain UTF-8 in comments. check-obsolete-constructs opened files without explicitly specifying their encoding, so it would barf on these headers if “make check” was run in a non-UTF-8 locale. * scripts/check-obsolete-constructs.py (HeaderChecker.check): Specify encoding="utf-8" when opening headers to check. --- ChangeLog | 5 +++++ scripts/check-obsolete-constructs.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f2cdcd7a667..f0281e5d10a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2019-03-14 Zack Weinberg + + * scripts/check-obsolete-constructs.py (HeaderChecker.check): + Specify encoding="utf-8" when opening headers to check. + 2019-03-13 Joseph Myers * scripts/build-many-glibcs.py (Context.checkout): Default Linux diff --git a/scripts/check-obsolete-constructs.py b/scripts/check-obsolete-constructs.py index ce5c72251f4..89d21dea6e7 100755 --- a/scripts/check-obsolete-constructs.py +++ b/scripts/check-obsolete-constructs.py @@ -437,7 +437,7 @@ class HeaderChecker: def check(self, fname): self.fname = fname try: - with open(fname, "rt") as fp: + with open(fname, "rt", encoding="utf-8") as fp: contents = fp.read() except OSError as e: sys.stderr.write("{}: {}\n".format(fname, e.strerror)) -- 2.39.2