From 38bbdd80db07c7a4edc9451477bfa6d53927284d Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Sun, 20 Sep 2015 12:10:28 -0400 Subject: [PATCH 1/2] Remove parens around Python 'assert' statement 'assert' is a statement, not a function --- .../script/dom/bindings/codegen/CodegenRust.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index e5a90633f01..d659da14d94 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -650,7 +650,7 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None, """ # We should not have a defaultValue if we know we're an object - assert(not isDefinitelyObject or defaultValue is None) + assert not isDefinitelyObject or defaultValue is None # If exceptionCode is not set, we'll just rethrow the exception we got. # Note that we can't just set failureCode to exceptionCode, because setting @@ -908,7 +908,7 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None, "handleInvalidEnumValueCode": handleInvalidEnumValueCode}) if defaultValue is not None: - assert(defaultValue.type.tag() == IDLType.Tags.domstring) + assert defaultValue.type.tag() == IDLType.Tags.domstring default = "%s::%s" % (enum, getEnumValueName(defaultValue.value)) else: default = None @@ -1065,7 +1065,7 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None, elif tag in numericTags: defaultStr = str(defaultValue.value) else: - assert(tag == IDLType.Tags.bool) + assert tag == IDLType.Tags.bool defaultStr = toStringBool(defaultValue.value) if type.nullable(): @@ -1137,7 +1137,7 @@ class CGArgumentConverter(CGThing): def __init__(self, argument, index, args, argc, descriptorProvider, invalidEnumValueFatal=True): CGThing.__init__(self) - assert(not argument.defaultValue or argument.optional) + assert not argument.defaultValue or argument.optional replacer = { "index": index, @@ -1364,7 +1364,7 @@ class PropertyDefiner: returns a tuple suitable for substitution into specTemplate. """ - assert(len(array) is not 0) + assert len(array) is not 0 specs = [] for member in array: @@ -3034,8 +3034,8 @@ class CGMemberJITInfo(CGThing): reason (e.g. we have overloads or we're not a method) and otherwise an iterable of the arguments for this method. """ - assert(not movable or aliasSet != "AliasEverything") # Can't move write-aliasing things - assert(not alwaysInSlot or movable) # Things always in slots had better be movable + assert not movable or aliasSet != "AliasEverything" # Can't move write-aliasing things + assert not alwaysInSlot or movable # Things always in slots had better be movable def jitInfoInitializer(isTypedMethod): initializer = fill( From 3b99893eaa839d6c321ee8703ff4d022ef8aa4c4 Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Sun, 20 Sep 2015 12:39:18 -0400 Subject: [PATCH 2/2] Python 'is' operator should not be used to check value 'is' checks reference. '==' checks value --- components/script/dom/bindings/codegen/CodegenRust.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index d659da14d94..0ccf51cd356 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -1364,7 +1364,7 @@ class PropertyDefiner: returns a tuple suitable for substitution into specTemplate. """ - assert len(array) is not 0 + assert len(array) != 0 specs = [] for member in array: @@ -4156,7 +4156,7 @@ class CGDOMJSProxyHandler_defineProperty(CGAbstractExternMethod): indexedSetter = self.descriptor.operations['IndexedSetter'] if indexedSetter: - if not (self.descriptor.operations['IndexedCreator'] is indexedSetter): + if self.descriptor.operations['IndexedCreator'] != indexedSetter: raise TypeError("Can't handle creator that's different from the setter") set += ("let index = get_array_index_from_id(cx, id);\n" + "if let Some(index) = index {\n" + @@ -4173,7 +4173,7 @@ class CGDOMJSProxyHandler_defineProperty(CGAbstractExternMethod): namedSetter = self.descriptor.operations['NamedSetter'] if namedSetter: - if not self.descriptor.operations['NamedCreator'] is namedSetter: + if self.descriptor.operations['NamedCreator'] != namedSetter: raise TypeError("Can't handle creator that's different from the setter") set += ("if RUST_JSID_IS_STRING(id) != 0 {\n" + CGIndenter(CGProxyNamedSetter(self.descriptor)).define() +