From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 8174F20248 for ; Thu, 14 Mar 2019 13:49:17 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; q=dns; s=default; b=AXA +br/JUP8qqtGyQLFdoeOgn4XQsFkLktOe7RPo2Vj0fMMPueqT9BA/heOi0E0RuGC VisD1wN29uF1MTWwDJHj4/vnrX4mglkBETUP2eFTpnPQht8O/xMSlfubJsQXike5 Aa6onBZbfV1ytxogojjw/WxhQSWH7hnmUnIUWRP4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; s=default; bh=HR+ZyYmuH I6qn7hBTQ6EM+WqAwI=; b=wF2iSIO1D4qo1INO108nX/yHN1FoDtw1ojbIctFcs wTZ5E6d53jISHUmj0PARTuOrVaPa7Zu1ok8PnGbaNh1JWOhyqdYXNKl+TOKpuNVO beG5WFJxvTrt1sNoW2Yq5TR0XLTiv38XPuQAG6fRd0otjoCWStG2/42WjGh1pCYy UY= Received: (qmail 21115 invoked by alias); 14 Mar 2019 13:49:14 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 21100 invoked by uid 89); 14 Mar 2019 13:49:14 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: mailbackend.panix.com From: Zack Weinberg To: libc-alpha@sourceware.org Subject: [PATCH COMMITTED] scripts/check-obsolete-constructs.py: Process all headers as UTF-8. Date: Thu, 14 Mar 2019 09:49:11 -0400 Message-Id: <20190314134911.8160-1-zackw@panix.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 f2cdcd7a66..f0281e5d10 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 ce5c72251f..89d21dea6e 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.20.1