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