0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch 1.2 KB

123456789101112131415161718192021222324252627282930313233
  1. From 78360c01c796b6260bf828bc9c8a0ef73c5132fd Mon Sep 17 00:00:00 2001
  2. From: Konstantin Tokarev <annulen@yandex.ru>
  3. Date: Wed, 3 Jun 2020 15:01:42 +0300
  4. Subject: [PATCH] Fix compilation with Python 3.9: avoid passing encoding to
  5. json.load()
  6. In Python 2.7 UTF-8 is assumed by default, while in Python 3 this argument
  7. is not supported.
  8. Change-Id: Ic459d60a6b20bc1838d8771bc36ac41614fe61a9
  9. Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
  10. [james.hilliard1@gmail.com: backport from upstream commit
  11. 78360c01c796b6260bf828bc9c8a0ef73c5132fd]
  12. ---
  13. Source/JavaScriptCore/generate-bytecode-files | 2 +-
  14. 1 file changed, 1 insertion(+), 1 deletion(-)
  15. diff --git a/Source/JavaScriptCore/generate-bytecode-files b/Source/JavaScriptCore/generate-bytecode-files
  16. index c5dab429c7b0..af3431275ecf 100644
  17. --- a/Source/JavaScriptCore/generate-bytecode-files
  18. +++ b/Source/JavaScriptCore/generate-bytecode-files
  19. @@ -163,7 +163,7 @@ if __name__ == "__main__":
  20. initBytecodesFile = openOrExit(initASMFileName, "w")
  21. try:
  22. - bytecodeSections = json.load(bytecodeFile, encoding = "utf-8")
  23. + bytecodeSections = json.load(bytecodeFile)
  24. except:
  25. print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info()))
  26. --
  27. 2.25.1