From e8b9296c67dffaddd26dce06d8daaca6206fa620 Mon Sep 17 00:00:00 2001 From: Philippe Mathieu-Daude Date: Thu, 5 Dec 2019 19:19:42 +0800 Subject: .pytool: Avoid "is" with a literal Python 3.8 warnings in CI plugins REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2304 To avoid SyntaxWarning with Python 3.8, change the 'is' operator by the conventional '==' comparator. Cc: Sean Brogan Cc: Bret Barkelew Cc: Michael D Kinney Cc: Liming Gao Reviewed-by: Bob Feng Signed-off-by: Philippe Mathieu-Daude --- .pytool/Plugin/DscCompleteCheck/DscCompleteCheck.py | 2 +- .pytool/Plugin/LibraryClassCheck/LibraryClassCheck.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to '.pytool') diff --git a/.pytool/Plugin/DscCompleteCheck/DscCompleteCheck.py b/.pytool/Plugin/DscCompleteCheck/DscCompleteCheck.py index e2485f5708..9af4f72c8d 100644 --- a/.pytool/Plugin/DscCompleteCheck/DscCompleteCheck.py +++ b/.pytool/Plugin/DscCompleteCheck/DscCompleteCheck.py @@ -61,7 +61,7 @@ class DscCompleteCheck(ICiBuildPlugin): abs_dsc_path = os.path.join(abs_pkg_path, pkgconfig["DscPath"].strip()) wsr_dsc_path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(abs_dsc_path) - if abs_dsc_path is None or wsr_dsc_path is "" or not os.path.isfile(abs_dsc_path): + if abs_dsc_path is None or wsr_dsc_path == "" or not os.path.isfile(abs_dsc_path): tc.SetSkipped() tc.LogStdError("Package Dsc not found") return 0 diff --git a/.pytool/Plugin/LibraryClassCheck/LibraryClassCheck.py b/.pytool/Plugin/LibraryClassCheck/LibraryClassCheck.py index 5dafcbc13f..a62a7e912b 100644 --- a/.pytool/Plugin/LibraryClassCheck/LibraryClassCheck.py +++ b/.pytool/Plugin/LibraryClassCheck/LibraryClassCheck.py @@ -67,7 +67,7 @@ class LibraryClassCheck(ICiBuildPlugin): abs_dec_path = self.__GetPkgDec(abs_pkg_path) wsr_dec_path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(abs_dec_path) - if abs_dec_path is None or wsr_dec_path is "" or not os.path.isfile(abs_dec_path): + if abs_dec_path is None or wsr_dec_path == "" or not os.path.isfile(abs_dec_path): tc.SetSkipped() tc.LogStdError("No DEC file {0} in package {1}".format(abs_dec_path, abs_pkg_path)) return -1 -- cgit v1.2.3