BaseTools: Refactor python except statements

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / UniClassObject.py

diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py
index 54b6fb22a08ad6881b78f9d5ec7fb8250e430176..06cf3e7d5162b694f38f0a30c295706f19e05534 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/UniClassObject.py
+++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py
@@ -21,7 +21,7 @@ import distutils.util
 import Common.EdkLogger as EdkLogger\r
 import StringIO\r
 from Common.BuildToolError import *\r
-from Common.String import GetLineNo\r
+from Common.StringUtils import GetLineNo\r
 from Common.Misc import PathClass\r
 from Common.LongFilePathSupport import LongFilePath\r
 from Common.GlobalData import *\r
@@ -254,7 +254,7 @@ class UniFileClassObject(object):
         if len(Lang) != 3:\r
             try:\r
                 FileIn = UniFileClassObject.OpenUniFile(LongFilePath(File.Path))\r
-            except UnicodeError, X:\r
+            except UnicodeError as X:\r
                 EdkLogger.error("build", FILE_READ_FAILURE, "File read failure: %s" % str(X), ExtraData=File);\r
             except:\r
                 EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=File);\r
@@ -393,7 +393,7 @@ class UniFileClassObject(object):
 \r
         try:\r
             FileIn = UniFileClassObject.OpenUniFile(LongFilePath(File.Path))\r
-        except UnicodeError, X:\r
+        except UnicodeError as X:\r
             EdkLogger.error("build", FILE_READ_FAILURE, "File read failure: %s" % str(X), ExtraData=File.Path);\r
         except:\r
             EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=File.Path);\r