From nobody Sat Apr 20 11:40:49 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1533329266858231.96144439071531; Fri, 3 Aug 2018 13:47:46 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 185A021A00AE6; Fri, 3 Aug 2018 13:47:42 -0700 (PDT) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 37E2921A00AE6 for ; Fri, 3 Aug 2018 13:47:40 -0700 (PDT) Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Aug 2018 13:47:39 -0700 Received: from mdkinney-mobl2.amr.corp.intel.com ([10.254.66.232]) by fmsmga007.fm.intel.com with ESMTP; 03 Aug 2018 13:47:39 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.20; helo=mga02.intel.com; envelope-from=michael.d.kinney@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,439,1526367600"; d="scan'208";a="59580700" From: "Kinney, Michael D" To: edk2-devel@lists.01.org Date: Fri, 3 Aug 2018 13:47:33 -0700 Message-Id: <20180803204733.6836-1-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.14.2.windows.3 Subject: [edk2] [Patch] BaseTools/BinToPcd: Open output file as text file X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael D Kinney , YanYan Sun , Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RDMRC_1 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D1069 Undo changes from following commit: https://github.com/tianocore/edk2/commit/83964ebc5e74549d6efc7134af19150a0b= 2079aa Change the open mode for the output file from 'wb' to 'w' so the output file is written as a text file and not a binary file. This resolves the issue where the text file was not writable from Python 3.x and also removes b'' from output file when the string was encoded as a bytearray. Cc: YanYan Sun Cc: Yonghong Zhu Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney --- BaseTools/Scripts/BinToPcd.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/BaseTools/Scripts/BinToPcd.py b/BaseTools/Scripts/BinToPcd.py index 1495a36933..316cc6117f 100644 --- a/BaseTools/Scripts/BinToPcd.py +++ b/BaseTools/Scripts/BinToPcd.py @@ -70,8 +70,7 @@ if __name__ =3D=3D '__main__': # # Return a PCD value of the form '{0x01, 0x02, ...}' along with th= e PCD length in bytes # - PcdValue =3D '{' + ', '.join (['0x{Byte:02X}'.format (Byte =3D Ite= m) for Item in Buffer]) + '}' - return PcdValue.encode (), len (Buffer) + return '{' + (', '.join (['0x{Byte:02X}'.format (Byte =3D Item) fo= r Item in Buffer])) + '}', len (Buffer) =20 # # Create command line argument parser object @@ -81,7 +80,7 @@ if __name__ =3D=3D '__main__': conflict_handler =3D 'resolve') parser.add_argument ("-i", "--input", dest =3D 'InputFile', type =3D a= rgparse.FileType ('rb'), action=3D'append', required =3D True, help =3D "Input binary filename. Multiple input = files are combined into a single PCD.") - parser.add_argument ("-o", "--output", dest =3D 'OutputFile', type =3D= argparse.FileType ('wb'), + parser.add_argument ("-o", "--output", dest =3D 'OutputFile', type =3D= argparse.FileType ('w'), help =3D "Output filename for PCD value or PCD st= atement") parser.add_argument ("-p", "--pcd", dest =3D 'PcdName', type =3D Valid= atePcdName, help =3D "Name of the PCD in the form .") --=20 2.14.2.windows.3 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel