BaseTools: Refactor python except statements

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Core / DependencyRules.py

diff --git a/BaseTools/Source/Python/UPT/Core/DependencyRules.py b/BaseTools/Source/Python/UPT/Core/DependencyRules.py
index 909c584e4ec2a93eefdb6dfa71abae60eb1c2549..34f56e7bb487b9e719f0a303c7af7e4ea89f0dc1 100644 (file)
--- a/BaseTools/Source/Python/UPT/Core/DependencyRules.py
+++ b/BaseTools/Source/Python/UPT/Core/DependencyRules.py
@@ -55,6 +55,8 @@ class DependencyRules(object):
         self.PkgsToBeDepend.extend(self.GenToBeInstalledPkgList(ToBeInstalledPkgList))\r
         \r
     def GenToBeInstalledPkgList(self, ToBeInstalledPkgList):\r
+        if not ToBeInstalledPkgList:\r
+            return []\r
         RtnList = []\r
         for Dist in ToBeInstalledPkgList:\r
             for Package in Dist.PackageSurfaceArea:\r
@@ -102,12 +104,12 @@ class DependencyRules(object):
             # check whether satisfied by current distribution \r
             #\r
             if not Exist:\r
-                if DpObj == None:\r
+                if DpObj is None:\r
                     Result = False\r
                     break\r
                 for GuidVerPair in DpObj.PackageSurfaceArea.keys():\r
                     if Dep.GetGuid() == GuidVerPair[0]:\r
-                        if Dep.GetVersion() == None or \\r
+                        if Dep.GetVersion() is None or \\r
                         len(Dep.GetVersion()) == 0:\r
                             Result = True\r
                             break\r
@@ -392,7 +394,7 @@ def VerifyRemoveModuleDep(Path, DpPackagePathList):
                 return False\r
         else:\r
             return True\r
-    except FatalError, ErrCode:\r
+    except FatalError as ErrCode:\r
         if ErrCode.message == EDK1_INF_ERROR:\r
             Logger.Warn("UPT",\r
                         ST.WRN_EDK1_INF_FOUND%Path)\r
@@ -444,7 +446,7 @@ def VerifyReplaceModuleDep(Path, DpPackagePathList, OtherPkgList):
                     return False\r
         else:\r
             return True\r
-    except FatalError, ErrCode:\r
+    except FatalError as ErrCode:\r
         if ErrCode.message == EDK1_INF_ERROR:\r
             Logger.Warn("UPT",\r
                         ST.WRN_EDK1_INF_FOUND%Path)\r