[Patch 1/2] BaseTools: Eot failed when enable python3

[Patch 1/2] BaseTools: Eot failed when enable python3

[Feng, Bob C]

The Eot will report error when python3 enabled.
We replaced sdict with collections.OrderedDict in python3
patch set, but the sdict implement "append" method which is not
implemented in collections.OrderedDict.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
---
 BaseTools/Source/Python/Eot/EotMain.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/Eot/EotMain.py b/BaseTools/Source/Python/Eot/EotMain.py
index 56aa48d2a1..3020f6525e 100644
--- a/BaseTools/Source/Python/Eot/EotMain.py
+++ b/BaseTools/Source/Python/Eot/EotMain.py
@@ -1103,11 +1103,11 @@ class MultipleFv(FirmwareVolume):
 
             Fv = FirmwareVolume(FvName)
             Fv.frombuffer(Buf, 0, len(Buf))
 
             self.BasicInfo.append([Fv.Name, Fv.FileSystemGuid, Fv.Size])
-            self.FfsDict.append(Fv.FfsDict)
+            self.FfsDict.update(Fv.FfsDict)
 
 ## Class Eot
 #
 # This class is used to define Eot main entrance
 #
-- 
2.20.1.windows.1

Re: [Patch 1/2] BaseTools: Eot failed when enable python3

[Gao, Liming]

Reviewed-by: Liming Gao <liming.gao@intel.com>

> -----Original Message-----
> From: Feng, Bob C
> Sent: Monday, February 25, 2019 5:22 PM
> To: edk2-devel@lists.01.org
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com>
> Subject: [Patch 1/2] BaseTools: Eot failed when enable python3
> 
> The Eot will report error when python3 enabled.
> We replaced sdict with collections.OrderedDict in python3
> patch set, but the sdict implement "append" method which is not
> implemented in collections.OrderedDict.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> ---
>  BaseTools/Source/Python/Eot/EotMain.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/Python/Eot/EotMain.py b/BaseTools/Source/Python/Eot/EotMain.py
> index 56aa48d2a1..3020f6525e 100644
> --- a/BaseTools/Source/Python/Eot/EotMain.py
> +++ b/BaseTools/Source/Python/Eot/EotMain.py
> @@ -1103,11 +1103,11 @@ class MultipleFv(FirmwareVolume):
> 
>              Fv = FirmwareVolume(FvName)
>              Fv.frombuffer(Buf, 0, len(Buf))
> 
>              self.BasicInfo.append([Fv.Name, Fv.FileSystemGuid, Fv.Size])
> -            self.FfsDict.append(Fv.FfsDict)
> +            self.FfsDict.update(Fv.FfsDict)
> 
>  ## Class Eot
>  #
>  # This class is used to define Eot main entrance
>  #
> --
> 2.20.1.windows.1