* [PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed
@ 2019-03-01 2:52 Fan, ZhijuX
2019-03-01 16:00 ` Carsey, Jaben
2019-03-04 7:29 ` Feng, Bob C
0 siblings, 2 replies; 5+ messages in thread
From: Fan, ZhijuX @ 2019-03-01 2:52 UTC (permalink / raw)
To: edk2-devel@lists.01.org; +Cc: Gao, Liming, Feng, Bob C
The reason for this problem is that the file was opened incorrectly.
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
---
.../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/EdkPlugins/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
try:
- f = open(path, 'r')
- lines = f.readlines()
- f.close()
+ with open(path, 'r') as f:
+ lines = f.readlines()
+ except UnicodeDecodeError:
+ return
except IOError:
ErrorMsg('Fail to open file %s' % path)
return
--
2.14.1.windows.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed
2019-03-01 2:52 [PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed Fan, ZhijuX
@ 2019-03-01 16:00 ` Carsey, Jaben
2019-03-04 7:29 ` Feng, Bob C
1 sibling, 0 replies; 5+ messages in thread
From: Carsey, Jaben @ 2019-03-01 16:00 UTC (permalink / raw)
To: Fan, ZhijuX, edk2-devel@lists.01.org; +Cc: Gao, Liming
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Fan, ZhijuX
> Sent: Thursday, February 28, 2019 6:52 PM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: [edk2] [PATCH V2] BaseTools:Run packagedoc_cli.py to generate
> doc failed
>
> The reason for this problem is that the file was opened incorrectly.
>
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
> ---
> .../plugins/EdkPlugins/edk2/model/doxygengen.py | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git
> a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/mode
> l/doxygengen.py
> b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/mod
> el/doxygengen.py
> index e31df262bc..73349e2f48 100644
> ---
> a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/mode
> l/doxygengen.py
> +++
> b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/mod
> el/doxygengen.py
> @@ -376,9 +376,10 @@ class PackageDocumentAction(DoxygenAction):
> return
>
> try:
> - f = open(path, 'r')
> - lines = f.readlines()
> - f.close()
> + with open(path, 'r') as f:
> + lines = f.readlines()
> + except UnicodeDecodeError:
> + return
> except IOError:
> ErrorMsg('Fail to open file %s' % path)
> return
> --
> 2.14.1.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed
2019-03-01 2:52 [PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed Fan, ZhijuX
2019-03-01 16:00 ` Carsey, Jaben
@ 2019-03-04 7:29 ` Feng, Bob C
2019-03-05 1:02 ` Feng, Bob C
1 sibling, 1 reply; 5+ messages in thread
From: Feng, Bob C @ 2019-03-04 7:29 UTC (permalink / raw)
To: Fan, ZhijuX, edk2-devel@lists.01.org; +Cc: Gao, Liming
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
-----Original Message-----
From: Fan, ZhijuX
Sent: Friday, March 1, 2019 10:52 AM
To: edk2-devel@lists.01.org
Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
Subject: [edk2][PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed
The reason for this problem is that the file was opened incorrectly.
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
---
.../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/EdkPlugins/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
try:
- f = open(path, 'r')
- lines = f.readlines()
- f.close()
+ with open(path, 'r') as f:
+ lines = f.readlines()
+ except UnicodeDecodeError:
+ return
except IOError:
ErrorMsg('Fail to open file %s' % path)
return
--
2.14.1.windows.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed
2019-03-04 7:29 ` Feng, Bob C
@ 2019-03-05 1:02 ` Feng, Bob C
2019-03-05 2:29 ` Gao, Liming
0 siblings, 1 reply; 5+ messages in thread
From: Feng, Bob C @ 2019-03-05 1:02 UTC (permalink / raw)
To: Gao, Liming, Fan, ZhijuX, edk2-devel@lists.01.org
Hi,
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 <zhijux.fan@intel.com>; edk2-devel@lists.01.org
Cc: Gao, Liming <liming.gao@intel.com>
Subject: Re: [edk2] [PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
-----Original Message-----
From: Fan, ZhijuX
Sent: Friday, March 1, 2019 10:52 AM
To: edk2-devel@lists.01.org
Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
Subject: [edk2][PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed
The reason for this problem is that the file was opened incorrectly.
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
---
.../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/EdkPlugins/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
try:
- f = open(path, 'r')
- lines = f.readlines()
- f.close()
+ with open(path, 'r') as f:
+ lines = f.readlines()
+ except UnicodeDecodeError:
+ return
except IOError:
ErrorMsg('Fail to open file %s' % path)
return
--
2.14.1.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed
2019-03-05 1:02 ` Feng, Bob C
@ 2019-03-05 2:29 ` Gao, Liming
0 siblings, 0 replies; 5+ messages in thread
From: Gao, Liming @ 2019-03-05 2:29 UTC (permalink / raw)
To: Feng, Bob C, Fan, ZhijuX, edk2-devel@lists.01.org
This is a bug. I agree to fix it for Q1 stable tag.
> -----Original Message-----
> From: Feng, Bob C
> Sent: Monday, March 4, 2019 5:02 PM
> To: Gao, Liming <liming.gao@intel.com>; Fan, ZhijuX <zhijux.fan@intel.com>; edk2-devel@lists.01.org
> Cc: Feng, Bob C <bob.c.feng@intel.com>
> Subject: RE: [edk2] [PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed
>
> Hi,
>
> 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 <zhijux.fan@intel.com>; edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: Re: [edk2] [PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed
>
> Reviewed-by: Bob Feng <bob.c.feng@intel.com>
>
>
> -----Original Message-----
> From: Fan, ZhijuX
> Sent: Friday, March 1, 2019 10:52 AM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
> Subject: [edk2][PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed
>
> The reason for this problem is that the file was opened incorrectly.
>
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
> ---
> .../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/EdkPlugins/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
>
> try:
> - f = open(path, 'r')
> - lines = f.readlines()
> - f.close()
> + with open(path, 'r') as f:
> + lines = f.readlines()
> + except UnicodeDecodeError:
> + return
> except IOError:
> ErrorMsg('Fail to open file %s' % path)
> return
> --
> 2.14.1.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-03-05 2:29 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-01 2:52 [PATCH V2] BaseTools:Run packagedoc_cli.py to generate doc failed Fan, ZhijuX
2019-03-01 16:00 ` Carsey, Jaben
2019-03-04 7:29 ` Feng, Bob C
2019-03-05 1:02 ` Feng, Bob C
2019-03-05 2:29 ` Gao, Liming
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox