From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.120; helo=mga04.intel.com; envelope-from=bob.c.feng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (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 7C878208D613E for ; Mon, 4 Mar 2019 17:02:30 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Mar 2019 17:02:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,441,1544515200"; d="scan'208";a="304387021" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga005.jf.intel.com with ESMTP; 04 Mar 2019 17:02:28 -0800 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 4 Mar 2019 17:02:17 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.158]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.134]) with mapi id 14.03.0415.000; Tue, 5 Mar 2019 09:02:15 +0800 From: "Feng, Bob C" To: "Gao, Liming" , "Fan, ZhijuX" , "edk2-devel@lists.01.org" Thread-Topic: [edk2] [PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed Thread-Index: AQHU0lwrf9tKm99tJ0mjWH4YLnBBgKX8OEDA Date: Tue, 5 Mar 2019 01:02:14 +0000 Message-ID: <08650203BA1BD64D8AD9B6D5D74A85D1600A82B1@SHSMSX101.ccr.corp.intel.com> References: <08650203BA1BD64D8AD9B6D5D74A85D1600A7E93@SHSMSX101.ccr.corp.intel.com> In-Reply-To: <08650203BA1BD64D8AD9B6D5D74A85D1600A7E93@SHSMSX101.ccr.corp.intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Mar 2019 01:02:30 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi,=20 This patch is to fix the a regression issue introduced by python3 patch set= . I'd like to push this patch for Q1 stable tag. Would you approve it? Thanks, Bob -----Original Message----- From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Feng= , Bob C Sent: Monday, March 4, 2019 3:30 PM To: Fan, ZhijuX ; edk2-devel@lists.01.org Cc: Gao, Liming Subject: Re: [edk2] [PATCH V2] BaseTools:Run packagedoc_cli.py to generate = doc failed Reviewed-by: Bob Feng -----Original Message----- From: Fan, ZhijuX=20 Sent: Friday, March 1, 2019 10:52 AM To: edk2-devel@lists.01.org Cc: Gao, Liming ; Feng, Bob C Subject: [edk2][PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc f= ailed The reason for this problem is that the file was opened incorrectly. Cc: Bob Feng Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Zhiju.Fan --- .../plugins/EdkPlugins/edk2/model/doxygengen.py | 7 +++= +--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2= /model/doxygengen.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPl= ugins/edk2/model/doxygengen.py index e31df262bc..73349e2f48 100644 --- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= doxygengen.py +++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= doxygengen.py @@ -376,9 +376,10 @@ class PackageDocumentAction(DoxygenAction): return =20 try: - f =3D open(path, 'r') - lines =3D f.readlines() - f.close() + with open(path, 'r') as f: + lines =3D f.readlines() + except UnicodeDecodeError: + return except IOError: ErrorMsg('Fail to open file %s' % path) return --=20 2.14.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel