diff options
| author | Sam Roberts <vieuxtech@gmail.com> | 2019-09-16 13:54:01 -0700 |
|---|---|---|
| committer | Myles Borins <myles.borins@gmail.com> | 2019-10-07 03:20:17 -0400 |
| commit | e442e5a6d1e9629faf8014e2c28b28d6d51546af (patch) | |
| tree | d69cca08a811fb7f87c3a7f1cb14821e08aa7cff | |
| parent | 019b23b3e4c3decd47246f7306b690c115e9b3e9 (diff) | |
| download | android-node-v8-e442e5a6d1e9629faf8014e2c28b28d6d51546af.tar.gz android-node-v8-e442e5a6d1e9629faf8014e2c28b28d6d51546af.tar.bz2 android-node-v8-e442e5a6d1e9629faf8014e2c28b28d6d51546af.zip | |
deps: V8: cherry-pick 35c6d4d
Original commit message:
Make code generator python3.7 compatible (async keyword).
Change-Id: Ifcd8b8cb1de60a007c7bbd4564d7869e83cb7109
Fixes: https://github.com/nodejs/node/issues/29548
Refs:
- https://github.com/nodejs/node/issues/29548#issuecomment-531717985
- https://github.com/nodejs/node/pull/29520
- https://github.com/nodejs/node/pull/29340
- https://chromium-review.googlesource.com/c/deps/inspector_protocol/+/1781351
- https://chromium.googlesource.com/deps/inspector_protocol/+/35c6d4d0d80b42d81bd00bcb1eb2b1093c80ed0a
PR-URL: https://github.com/nodejs/node/pull/29585
Refs: https://github.com/nodejs/node/pull/29520
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
| -rw-r--r-- | common.gypi | 2 | ||||
| -rwxr-xr-x | deps/v8/third_party/inspector_protocol/code_generator.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/common.gypi b/common.gypi index 4119517dbb..5ea3e36506 100644 --- a/common.gypi +++ b/common.gypi @@ -39,7 +39,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.10', + 'v8_embedder_string': '-node.11', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/third_party/inspector_protocol/code_generator.py b/deps/v8/third_party/inspector_protocol/code_generator.py index 7c72cc70e4..5cf5a308c5 100755 --- a/deps/v8/third_party/inspector_protocol/code_generator.py +++ b/deps/v8/third_party/inspector_protocol/code_generator.py @@ -43,6 +43,9 @@ def read_config(): items = [(k, os.path.join(output_base, v) if k == "output" else v) for (k, v) in items] keys, values = list(zip(*items)) + # 'async' is a keyword since Python 3.7. + # Avoid namedtuple(rename=True) for compatibility with Python 2.X. + keys = tuple('async_' if k == 'async' else k for k in keys) return collections.namedtuple('X', keys)(*values) return json.loads(data, object_hook=json_object_hook) @@ -555,7 +558,7 @@ class Protocol(object): if not self.config.protocol.options: return False return self.check_options(self.config.protocol.options, domain, command, - "async", None, False) + "async_", None, False) def is_exported(self, domain, name): if not self.config.protocol.options: |