-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
f9ab4f2
commit c8f0d40
Showing
2 changed files
with
30 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
From 78360c01c796b6260bf828bc9c8a0ef73c5132fd Mon Sep 17 00:00:00 2001 | ||
From: Konstantin Tokarev <annulen@yandex.ru> | ||
Date: Wed, 3 Jun 2020 15:01:42 +0300 | ||
Subject: [PATCH] Fix compilation with Python 3.9: avoid passing encoding to | ||
json.load() | ||
|
||
In Python 2.7 UTF-8 is assumed by default, while in Python 3 this argument | ||
is not supported. | ||
|
||
Change-Id: Ic459d60a6b20bc1838d8771bc36ac41614fe61a9 | ||
--- | ||
Source/JavaScriptCore/generate-bytecode-files | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/Source/JavaScriptCore/generate-bytecode-files b/Source/JavaScriptCore/generate-bytecode-files | ||
index c5dab429c7b0f..af3431275ecf9 100644 | ||
--- a/Source/JavaScriptCore/generate-bytecode-files | ||
+++ b/Source/JavaScriptCore/generate-bytecode-files | ||
@@ -163,7 +163,7 @@ if __name__ == "__main__": | ||
initBytecodesFile = openOrExit(initASMFileName, "w") | ||
|
||
try: | ||
- bytecodeSections = json.load(bytecodeFile, encoding = "utf-8") | ||
+ bytecodeSections = json.load(bytecodeFile) | ||
except: | ||
print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info())) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters