File ovmf.5d8648345cd9ad729837118c731063c59edea192.p... of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File ovmf.5d8648345cd9ad729837118c731063c59edea192.patch of Package xen

From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 12 Aug 2020 01:28:17 +0800
Subject: 5d8648345cd9ad729837118c731063c59edea192

BaseTools: fix ucs-2 lookup on python 3.9

python3.9 changed/fixed codec.register behavior to always replace
hyphen with underscore for passed in codec names:

https://bugs.python.org/issue37751

So the custom Ucs2Search needs to be adapted to handle 'ucs_2' in
addition to existing 'ucs-2' for back compat.

This fixes test failures on python3.9, example:

======================================================================
FAIL: testUtf16InUniFile (CheckUnicodeSourceFiles.Tests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/builddir/build/BUILD/edk2-edk2-stable202002/BaseTools/Source/Python/AutoGen/UniClassObject.py", line 375, in PreProcess
    FileIn = UniFileClassObject.OpenUniFile(LongFilePath(File.Path))
  File "/builddir/build/BUILD/edk2-edk2-stable202002/BaseTools/Source/Python/AutoGen/UniClassObject.py", line 303, in OpenUniFile
    UniFileClassObject.VerifyUcs2Data(FileIn, FileName, Encoding)
  File "/builddir/build/BUILD/edk2-edk2-stable202002/BaseTools/Source/Python/AutoGen/UniClassObject.py", line 312, in VerifyUcs2Data
    Ucs2Info = codecs.lookup('ucs-2')
LookupError: unknown encoding: ucs-2

Signed-off-by: Cole Robinson <crobinso@redhat.com>
Reviewed-by: Yuwei Chen <yuwei.chen@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
---
 BaseTools/Source/Python/AutoGen/UniClassObject.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/BaseTools/Source/Python/AutoGen/UniClassObject.py
+++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py
@@ -143,25 +143,25 @@ class Ucs2Codec(codecs.Codec):
     def encode(self, input, errors='strict'):
         for Char in input:
             CodePoint = ord(Char)
             if CodePoint >= 0xd800 and CodePoint <= 0xdfff:
                 raise ValueError("Code Point is in range reserved for " +
                                  "UTF-16 surrogate pairs")
             elif CodePoint > 0xffff:
                 raise ValueError("Code Point too large to encode in UCS-2")
         return self.__utf16.encode(input)
 
 TheUcs2Codec = Ucs2Codec()
 def Ucs2Search(name):
-    if name == 'ucs-2':
+    if name in ['ucs-2', 'ucs_2']:
         return codecs.CodecInfo(
             name=name,
             encode=TheUcs2Codec.encode,
             decode=TheUcs2Codec.decode)
     else:
         return None
 codecs.register(Ucs2Search)
 
 ## StringDefClassObject
 #
 # A structure for language definition
 #

Places

File ovmf.5d8648345cd9ad729837118c731063c59edea192.patch of Package xen

Places