Commit 43c5b91
deps: V8: cherry-pick 35c6d4d
Original commit message:
Make code generator python3.7 compatible (async keyword).
Change-Id: Ifcd8b8cb1de60a007c7bbd4564d7869e83cb7109
Fixes: #29548
Refs:
- #29548 (comment)
- #29520
- #29340
- https://chromium-review.googlesource.com/c/deps/inspector_protocol/+/1781351
- https://chromium.googlesource.com/deps/inspector_protocol/+/35c6d4d0d80b42d81bd00bcb1eb2b1093c80ed0a
Backport-PR-URL: #30109
PR-URL: #29585
Refs: #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>1 parent 23271dd commit 43c5b91
2 files changed
Lines changed: 5 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -38,7 +38,7 @@ | |||
| 38 | 38 | ||
| 39 | 39 | # Reset this number to 0 on major V8 upgrades. | |
| 40 | 40 | # Increment by one for each non-official patch applied to deps/v8. | |
| 41 | - 'v8_embedder_string': '-node.10', | ||
| 41 | + 'v8_embedder_string': '-node.11', | ||
| 42 | 42 | ||
| 43 | 43 | ##### V8 defaults for Node.js ##### | |
| 44 | 44 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -43,6 +43,9 @@ def json_object_hook(object_dict): | |||
| 43 | 43 | items = [(k, os.path.join(output_base, v) if k == "output" else v) | |
| 44 | 44 | for (k, v) in items] | |
| 45 | 45 | keys, values = list(zip(*items)) | |
| 46 | + # 'async' is a keyword since Python 3.7. | ||
| 47 | + # Avoid namedtuple(rename=True) for compatibility with Python 2.X. | ||
| 48 | + keys = tuple('async_' if k == 'async' else k for k in keys) | ||
| 46 | 49 | return collections.namedtuple('X', keys)(*values) | |
| 47 | 50 | return json.loads(data, object_hook=json_object_hook) | |
| 48 | 51 | ||
@@ -555,7 +558,7 @@ def is_async_command(self, domain, command): | |||
| 555 | 558 | if not self.config.protocol.options: | |
| 556 | 559 | return False | |
| 557 | 560 | return self.check_options(self.config.protocol.options, domain, command, | |
| 558 | - "async", None, False) | ||
| 561 | + "async_", None, False) | ||
| 559 | 562 | ||
| 560 | 563 | def is_exported(self, domain, name): | |
| 561 | 564 | if not self.config.protocol.options: | |
0 commit comments