BaseTools: Refactor python except statements

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Library / UniClassObject.py

diff --git a/BaseTools/Source/Python/UPT/Library/UniClassObject.py b/BaseTools/Source/Python/UPT/Library/UniClassObject.py
index 0014a7561ba88b1b02b735ecc04ba2b334571f0c..299cd871444b0614b4d30e74841e8bb70496d246 100644 (file)
--- a/BaseTools/Source/Python/UPT/Library/UniClassObject.py
+++ b/BaseTools/Source/Python/UPT/Library/UniClassObject.py
@@ -23,7 +23,7 @@ import distutils.util
 from Logger import ToolError\r
 from Logger import Log as EdkLogger\r
 from Logger import StringTable as ST\r
-from Library.String import GetLineNo\r
+from Library.StringUtils import GetLineNo\r
 from Library.Misc import PathClass\r
 from Library.Misc import GetCharIndexOutStr\r
 from Library import DataType as DT\r
@@ -161,7 +161,7 @@ def GetLanguageCode1766(LangName, File=None):
             for Key in gLANG_CONV_TABLE.keys():\r
                 if gLANG_CONV_TABLE.get(Key) == LangName[0:2].lower():\r
                     return Key\r
-        if LangName[0:3].isalpha() and gLANG_CONV_TABLE.get(LangName.lower()) == None and LangName[3] == '-':\r
+        if LangName[0:3].isalpha() and gLANG_CONV_TABLE.get(LangName.lower()) is None and LangName[3] == '-':\r
             for Key in gLANG_CONV_TABLE.keys():\r
                 if Key == LangName[0:3].lower():\r
                     return Key\r
@@ -186,7 +186,7 @@ def GetLanguageCode(LangName, IsCompatibleMode, File):
     if IsCompatibleMode:\r
         if length == 3 and LangName.isalpha():\r
             TempLangName = gLANG_CONV_TABLE.get(LangName.lower())\r
-            if TempLangName != None:\r
+            if TempLangName is not None:\r
                 return TempLangName\r
             return LangName\r
         else:\r
@@ -200,7 +200,7 @@ def GetLanguageCode(LangName, IsCompatibleMode, File):
         if LangName.isalpha():\r
             return LangName\r
     elif length == 3:\r
-        if LangName.isalpha() and gLANG_CONV_TABLE.get(LangName.lower()) == None:\r
+        if LangName.isalpha() and gLANG_CONV_TABLE.get(LangName.lower()) is None:\r
             return LangName\r
     elif length == 5:\r
         if LangName[0:2].isalpha() and LangName[2] == '-':\r
@@ -208,7 +208,7 @@ def GetLanguageCode(LangName, IsCompatibleMode, File):
     elif length >= 6:\r
         if LangName[0:2].isalpha() and LangName[2] == '-':\r
             return LangName\r
-        if LangName[0:3].isalpha() and gLANG_CONV_TABLE.get(LangName.lower()) == None and LangName[3] == '-':\r
+        if LangName[0:3].isalpha() and gLANG_CONV_TABLE.get(LangName.lower()) is None and LangName[3] == '-':\r
             return LangName\r
 \r
     EdkLogger.Error("Unicode File Parser", \r
@@ -270,14 +270,14 @@ class StringDefClassObject(object):
         self.UseOtherLangDef = UseOtherLangDef\r
         self.Length = 0\r
 \r
-        if Name != None:\r
+        if Name is not None:\r
             self.StringName = Name\r
             self.StringNameByteList = UniToHexList(Name)\r
-        if Value != None:\r
+        if Value is not None:\r
             self.StringValue = Value\r
             self.StringValueByteList = UniToHexList(self.StringValue)\r
             self.Length = len(self.StringValueByteList)\r
-        if Token != None:\r
+        if Token is not None:\r
             self.Token = Token\r
 \r
     def __str__(self):\r
@@ -288,7 +288,7 @@ class StringDefClassObject(object):
                repr(self.UseOtherLangDef)\r
 \r
     def UpdateValue(self, Value = None):\r
-        if Value != None:\r
+        if Value is not None:\r
             if self.StringValue:\r
                 self.StringValue = self.StringValue + '\r\n' + Value\r
             else:\r
@@ -327,9 +327,9 @@ class UniFileClassObject(object):
         if len(Lang) != 3:\r
             try:\r
                 FileIn = codecs.open(File.Path, mode='rb', encoding='utf_8').readlines()\r
-            except UnicodeError, Xstr:\r
+            except UnicodeError as Xstr:\r
                 FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16').readlines()\r
-            except UnicodeError, Xstr:\r
+            except UnicodeError as Xstr:\r
                 FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16_le').readlines()\r
             except:\r
                 EdkLogger.Error("Unicode File Parser", \r
@@ -393,7 +393,7 @@ class UniFileClassObject(object):
         # Check the string name is the upper character\r
         if Name != '':\r
             MatchString = re.match('[A-Z0-9_]+', Name, re.UNICODE)\r
-            if MatchString == None or MatchString.end(0) != len(Name):\r
+            if MatchString is None or MatchString.end(0) != len(Name):\r
                 EdkLogger.Error("Unicode File Parser", \r
                              ToolError.FORMAT_INVALID,\r
                              'The string token name %s in UNI file %s must be upper case character.' %(Name, self.File))\r
@@ -436,7 +436,7 @@ class UniFileClassObject(object):
 \r
         try:\r
             FileIn = codecs.open(File.Path, mode='rb', encoding='utf_8').readlines()\r
-        except UnicodeError, Xstr:\r
+        except UnicodeError as Xstr:\r
             FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16').readlines()\r
         except UnicodeError:\r
             FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16_le').readlines()\r
@@ -798,7 +798,7 @@ class UniFileClassObject(object):
     # Load a .uni file\r
     #\r
     def LoadUniFile(self, File = None):\r
-        if File == None:\r
+        if File is None:\r
             EdkLogger.Error("Unicode File Parser", \r
                             ToolError.PARSER_ERROR, \r
                             Message='No unicode file is given', \r
@@ -901,7 +901,7 @@ class UniFileClassObject(object):
         IsAdded = True\r
         if Name in self.OrderedStringDict[Language]:\r
             IsAdded = False\r
-            if Value != None:\r
+            if Value is not None:\r
                 ItemIndexInList = self.OrderedStringDict[Language][Name]\r
                 Item = self.OrderedStringList[Language][ItemIndexInList]\r
                 Item.UpdateValue(Value)\r
@@ -1042,7 +1042,7 @@ class UniFileClassObject(object):
                              ExtraData=FilaPath)\r
         try:\r
             FileIn = codecs.open(FilaPath, mode='rb', encoding='utf_8').readlines()\r
-        except UnicodeError, Xstr:\r
+        except UnicodeError as Xstr:\r
             FileIn = codecs.open(FilaPath, mode='rb', encoding='utf_16').readlines()\r
         except UnicodeError:\r
             FileIn = codecs.open(FilaPath, mode='rb', encoding='utf_16_le').readlines()\r