BaseTools: Handle the bytes and str difference

[mirror_edk2.git] / BaseTools / Source / Python / Common / Misc.py

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index d3b71fc4a2662258cbc3410e7c255bd6099d3248..6b3c4f793723db68ed56618d1c2c44fa1e2cba90 100644 (file)
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -456,15 +456,22 @@ def RemoveDirectory(Directory, Recursively=False):
 #   @retval     False           If the file content is the same\r
 #\r
 def SaveFileOnChange(File, Content, IsBinaryFile=True):\r
-    if not IsBinaryFile:\r
-        Content = Content.replace("\n", os.linesep)\r
 \r
     if os.path.exists(File):\r
-        try:\r
-            if Content == open(File, "rb").read():\r
-                return False\r
-        except:\r
-            EdkLogger.error(None, FILE_OPEN_FAILURE, ExtraData=File)\r
+        if IsBinaryFile:\r
+            try:\r
+                with open(File, "rb") as f:\r
+                    if Content == f.read():\r
+                        return False\r
+            except:\r
+                EdkLogger.error(None, FILE_OPEN_FAILURE, ExtraData=File)\r
+        else:\r
+            try:\r
+                with open(File, "r") as f:\r
+                    if Content == f.read():\r
+                        return False\r
+            except:\r
+                EdkLogger.error(None, FILE_OPEN_FAILURE, ExtraData=File)\r
 \r
     DirName = os.path.dirname(File)\r
     if not CreateDirectory(DirName):\r
@@ -475,12 +482,18 @@ def SaveFileOnChange(File, Content, IsBinaryFile=True):
         if not os.access(DirName, os.W_OK):\r
             EdkLogger.error(None, PERMISSION_FAILURE, "Do not have write permission on directory %s" % DirName)\r
 \r
-    try:\r
-        Fd = open(File, "wb")\r
-        Fd.write(Content)\r
-        Fd.close()\r
-    except IOError as X:\r
-        EdkLogger.error(None, FILE_CREATE_FAILURE, ExtraData='IOError %s' % X)\r
+    if IsBinaryFile:\r
+        try:\r
+            with open(File, "wb") as Fd:\r
+                Fd.write(Content)\r
+        except IOError as X:\r
+            EdkLogger.error(None, FILE_CREATE_FAILURE, ExtraData='IOError %s' % X)\r
+    else:\r
+        try:\r
+            with open(File, 'w') as Fd:\r
+                Fd.write(Content)\r
+        except IOError as X:\r
+            EdkLogger.error(None, FILE_CREATE_FAILURE, ExtraData='IOError %s' % X)\r
 \r
     return True\r
 \r
@@ -1060,7 +1073,10 @@ def ParseFieldValue (Value):
         if Value[0] == '"' and Value[-1] == '"':\r
             Value = Value[1:-1]\r
         try:\r
-            Value = "'" + uuid.UUID(Value).bytes_le + "'"\r
+            Value = str(uuid.UUID(Value).bytes_le)\r
+            if Value.startswith("b'"):\r
+                Value = Value[2:-1]\r
+            Value = "'" + Value + "'"\r
         except ValueError as Message:\r
             raise BadExpression(Message)\r
         Value, Size = ParseFieldValue(Value)\r
@@ -1536,7 +1552,7 @@ class PeImageClass():
         ByteArray = array.array('B')\r
         ByteArray.fromfile(PeObject, 4)\r
         # PE signature should be 'PE\0\0'\r
-        if ByteArray.tostring() != 'PE\0\0':\r
+        if ByteArray.tostring() != b'PE\0\0':\r
             self.ErrorInfo = self.FileName + ' has no valid PE signature PE00'\r
             return\r
 \r
@@ -1752,7 +1768,7 @@ class SkuClass():
 #   @retval     Value    The integer value that the input represents\r
 #\r
 def GetIntegerValue(Input):\r
-    if type(Input) in (int, long):\r
+    if not isinstance(Input, str):\r
         return Input\r
     String = Input\r
     if String.endswith("U"):\r