Commit bc7cc34
tools: python3 compat for inspector code generator
The code generator takes a dict and turns it into a namedtuple. The dict
contains the key "async", which is a keyword in python 3.7, and rejected
by the namedtuple constructor. Rename it to "async_" to avoid the clash.
Fixes: #29326
PR-URL: #29340
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>1 parent 2dc52ad commit bc7cc34
1 file changed
Lines changed: 4 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -41,6 +41,9 @@ def json_object_hook(object_dict): | |||
| 41 | 41 | items = [(k, os.path.join(output_base, v) if k == "path" else v) for (k, v) in object_dict.items()] | |
| 42 | 42 | items = [(k, os.path.join(output_base, v) if k == "output" else v) for (k, v) in items] | |
| 43 | 43 | keys, values = list(zip(*items)) | |
| 44 | + # 'async' is a python 3.7 keyword. Don't use namedtuple(rename=True) | ||
| 45 | + # because that only renames it in python 3 but not python 2. | ||
| 46 | + keys = tuple('async_' if k == 'async' else k for k in keys) | ||
| 44 | 47 | return collections.namedtuple('X', keys)(*values) | |
| 45 | 48 | return json.loads(data, object_hook=json_object_hook) | |
| 46 | 49 | ||
@@ -521,7 +524,7 @@ def generate_type(self, domain, typename): | |||
| 521 | 524 | def is_async_command(self, domain, command): | |
| 522 | 525 | if not self.config.protocol.options: | |
| 523 | 526 | return False | |
| 524 | - return self.check_options(self.config.protocol.options, domain, command, "async", None, False) | ||
| 527 | + return self.check_options(self.config.protocol.options, domain, command, "async_", None, False) | ||
| 525 | 528 | ||
| 526 | 529 | ||
| 527 | 530 | def is_exported(self, domain, name): | |
0 commit comments