diff options
Diffstat (limited to 'mojo/public/tools/bindings/generators')
| -rw-r--r-- | mojo/public/tools/bindings/generators/mojom_cpp_generator.py | 4 | ||||
| -rw-r--r-- | mojo/public/tools/bindings/generators/mojom_java_generator.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mojo/public/tools/bindings/generators/mojom_cpp_generator.py b/mojo/public/tools/bindings/generators/mojom_cpp_generator.py index ceded69e1f..97bc827c9e 100644 --- a/mojo/public/tools/bindings/generators/mojom_cpp_generator.py +++ b/mojo/public/tools/bindings/generators/mojom_cpp_generator.py @@ -266,7 +266,7 @@ class Generator(generator.Generator): for typename in self.module.structs + all_enums + self.module.unions) headers = set() - for typename, typemap in self.typemap.iteritems(): + for typename, typemap in self.typemap.items(): if typename in types: headers.update(typemap.get("public_headers", [])) return sorted(headers) @@ -788,7 +788,7 @@ class Generator(generator.Generator): if param_counts[-1] != version.num_fields: param_counts.append(version.num_fields) - ordinal_fields = sorted(struct.fields, key=lambda field: field.ordinal) + ordinal_fields = sorted(struct.fields, key=lambda field: field.ordinal if field.ordinal != None else -1) return (StructConstructor(struct.fields, ordinal_fields[:param_count]) for param_count in param_counts) diff --git a/mojo/public/tools/bindings/generators/mojom_java_generator.py b/mojo/public/tools/bindings/generators/mojom_java_generator.py index 0f2b618182..4e32c52b9a 100644 --- a/mojo/public/tools/bindings/generators/mojom_java_generator.py +++ b/mojo/public/tools/bindings/generators/mojom_java_generator.py @@ -153,7 +153,7 @@ def GetInterfaceResponseName(method): return UpperCamelCase(method.name + 'Response') def ParseStringAttribute(attribute): - assert isinstance(attribute, basestring) + assert isinstance(attribute, str) return attribute def GetJavaTrueFalse(value): @@ -333,7 +333,7 @@ def ExpressionToText(context, token, kind_spec=''): if kind_spec.startswith('i') or kind_spec.startswith('u'): # Add Long suffix to all integer literals. number = ast.literal_eval(token.lstrip('+ ')) - if not isinstance(number, (int, long)): + if not isinstance(number, int): raise ValueError('got unexpected type %r for int literal %r' % ( type(number), token)) # If the literal is too large to fit a signed long, convert it to the |