BaseTools: Clean up source files

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / CapsuleData.py

diff --git a/BaseTools/Source/Python/GenFds/CapsuleData.py b/BaseTools/Source/Python/GenFds/CapsuleData.py
index 5b806d9e44825a6a1a4d20cd05cbc365f9e73004..9d17bf5afe28015be93375bc81c812a1da68709d 100644 (file)
--- a/BaseTools/Source/Python/GenFds/CapsuleData.py
+++ b/BaseTools/Source/Python/GenFds/CapsuleData.py
@@ -1,7 +1,7 @@
 ## @file\r
 # generate capsule\r
 #\r
-#  Copyright (c) 2007-2017, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007-2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -17,7 +17,7 @@
 #\r
 import Ffs\r
 from GenFdsGlobalVariable import GenFdsGlobalVariable\r
-import StringIO\r
+from io import BytesIO\r
 from struct import pack\r
 import os\r
 from Common.Misc import SaveFileOnChange\r
@@ -32,13 +32,13 @@ class CapsuleData:
     #   @param  self        The object pointer\r
     def __init__(self):\r
         pass\r
-    \r
+\r
     ## generate capsule data\r
     #\r
     #   @param  self        The object pointer\r
     def GenCapsuleSubItem(self):\r
         pass\r
-        \r
+\r
 ## FFS class for capsule data\r
 #\r
 #\r
@@ -80,9 +80,9 @@ class CapsuleFv (CapsuleData):
     #\r
     def GenCapsuleSubItem(self):\r
         if self.FvName.find('.fv') == -1:\r
-            if self.FvName.upper() in GenFdsGlobalVariable.FdfParser.Profile.FvDict.keys():\r
-                FvObj = GenFdsGlobalVariable.FdfParser.Profile.FvDict.get(self.FvName.upper())\r
-                FdBuffer = StringIO.StringIO('')\r
+            if self.FvName.upper() in GenFdsGlobalVariable.FdfParser.Profile.FvDict:\r
+                FvObj = GenFdsGlobalVariable.FdfParser.Profile.FvDict[self.FvName.upper()]\r
+                FdBuffer = BytesIO('')\r
                 FvObj.CapsuleName = self.CapsuleName\r
                 FvFile = FvObj.AddToBuffer(FdBuffer)\r
                 FvObj.CapsuleName = None\r
@@ -112,14 +112,14 @@ class CapsuleFd (CapsuleData):
     #\r
     def GenCapsuleSubItem(self):\r
         if self.FdName.find('.fd') == -1:\r
-            if self.FdName.upper() in GenFdsGlobalVariable.FdfParser.Profile.FdDict.keys():\r
-                FdObj = GenFdsGlobalVariable.FdfParser.Profile.FdDict.get(self.FdName.upper())\r
+            if self.FdName.upper() in GenFdsGlobalVariable.FdfParser.Profile.FdDict:\r
+                FdObj = GenFdsGlobalVariable.FdfParser.Profile.FdDict[self.FdName.upper()]\r
                 FdFile = FdObj.GenFd()\r
                 return FdFile\r
         else:\r
             FdFile = GenFdsGlobalVariable.ReplaceWorkspaceMacro(self.FdName)\r
             return FdFile\r
-        \r
+\r
 ## AnyFile class for capsule data\r
 #\r
 #\r
@@ -139,7 +139,7 @@ class CapsuleAnyFile (CapsuleData):
     #\r
     def GenCapsuleSubItem(self):\r
         return self.FileName\r
-    \r
+\r
 ## Afile class for capsule data\r
 #\r
 #\r
@@ -207,12 +207,12 @@ class CapsulePayload(CapsuleData):
         #\r
         Guid = self.ImageTypeId.split('-')\r
         Buffer = pack('=ILHHBBBBBBBBBBBBIIQ',\r
-                       int(self.Version,16),\r
-                       int(Guid[0], 16), \r
-                       int(Guid[1], 16), \r
-                       int(Guid[2], 16), \r
-                       int(Guid[3][-4:-2], 16), \r
-                       int(Guid[3][-2:], 16),  \r
+                       int(self.Version, 16),\r
+                       int(Guid[0], 16),\r
+                       int(Guid[1], 16),\r
+                       int(Guid[2], 16),\r
+                       int(Guid[3][-4:-2], 16),\r
+                       int(Guid[3][-2:], 16),\r
                        int(Guid[4][-12:-10], 16),\r
                        int(Guid[4][-10:-8], 16),\r
                        int(Guid[4][-8:-6], 16),\r