From nobody Tue Apr 23 14:50:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1590075439; cv=none; d=zohomail.com; s=zohoarc; b=SYotbQokIN7tEPgwm7CJQdna61E7zjtjbYzRbB0BZybI8JTCYFlA/tFUmY0jubzr4TBKwRwEaBcY6p6LcqdWx7/XnkhDB9vMri6S4ZppblUmFmOUlP0Uje0EcRdaV4LP+eFcqEbUYH035+aB+U3LlUB8FCew5FEk+cY+Q2BWpvQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590075439; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=hXDueTUGkhv7ebObH+z2sde/3y2Ea3oVitQ+E7WruxQ=; b=V8YM96fKWFSaFyvGPbRAtqJ6j3igkQ4jqOYmeCb0zVlQ3CS5YeUEbM+pIUSUJQjnMn/zmvqGVMOkoQgRtN5C5w6R2EaRq2FWoHtNQlY4rg81JviOK/7yW2QrQRwn51zHl3eN1xvUWMYsEuYVYJ5o32DcsfuaRaIHz4A4CpI6Rrc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590075439008326.475095152284; Thu, 21 May 2020 08:37:19 -0700 (PDT) Received: from localhost ([::1]:33086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jbnG1-0004pD-Pw for importer@patchew.org; Thu, 21 May 2020 11:37:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbnFC-0003oL-0u for qemu-devel@nongnu.org; Thu, 21 May 2020 11:36:26 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:54769 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jbnFB-0007tH-7r for qemu-devel@nongnu.org; Thu, 21 May 2020 11:36:25 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-192-uCWRpFXcPw-ybtkNUOtZJg-1; Thu, 21 May 2020 11:36:22 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 21682107ACCD for ; Thu, 21 May 2020 15:36:21 +0000 (UTC) Received: from localhost (ovpn-114-14.ams2.redhat.com [10.36.114.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id E5BF670461; Thu, 21 May 2020 15:36:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590075383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hXDueTUGkhv7ebObH+z2sde/3y2Ea3oVitQ+E7WruxQ=; b=KKiuo0AQMkQFqxu4yCzSoAa3xmMa8asIa2Z2Dc/otkseOXh4NOGbU6ehNvXmRQbHTsfPCM VwazE9xi0zW22dDYKP45RkUhMJP+CUlhseLuYKcOfSvMe6mvmJxRLHyzLdzv7lcOHqcrI6 1fGN5+8u0XplZo43ZMC0uH9d61ckIFk= X-MC-Unique: uCWRpFXcPw-ybtkNUOtZJg-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH] minikconf: explicitly set encoding to UTF-8 Date: Thu, 21 May 2020 16:36:16 +0100 Message-Id: <20200521153616.307100-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=stefanha@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/21 06:06:22 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Stefan Hajnoczi , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" QEMU currently only has ASCII Kconfig files but Linux actually uses UTF-8. Explicitly specify the encoding and that we're doing text file I/O. It's unclear whether or not QEMU will ever need Unicode in its Kconfig files. If we start using the help text then it will become an issue sooner or later. Make this change now for consistency with Linux Kconfig. Reported-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Stefan Hajnoczi Reviewed-by: Richard Henderson --- scripts/minikconf.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/minikconf.py b/scripts/minikconf.py index 90b99517c1..bcd91015d3 100755 --- a/scripts/minikconf.py +++ b/scripts/minikconf.py @@ -402,7 +402,7 @@ class KconfigParser: if incl_abs_fname in self.data.previously_included: return try: - fp =3D open(incl_abs_fname, 'r') + fp =3D open(incl_abs_fname, 'rt', encoding=3D'utf-8') except IOError as e: raise KconfigParserError(self, '%s: %s' % (e.strerror, include)) @@ -696,7 +696,7 @@ if __name__ =3D=3D '__main__': parser.do_assignment(name, value =3D=3D 'y') external_vars.add(name[7:]) else: - fp =3D open(arg, 'r') + fp =3D open(arg, 'rt', encoding=3D'utf-8') parser.parse_file(fp) fp.close() =20 @@ -705,7 +705,7 @@ if __name__ =3D=3D '__main__': if key not in external_vars and config[key]: print ('CONFIG_%s=3Dy' % key) =20 - deps =3D open(argv[2], 'w') + deps =3D open(argv[2], 'wt', encoding=3D'utf-8') for fname in data.previously_included: print ('%s: %s' % (argv[1], fname), file=3Ddeps) deps.close() --=20 2.25.3