auto merge of #1950 : Ms2ger/servo/nullable-string-with-null-default, r=jdm

This commit is contained in:
bors-servo 2014-03-21 06:49:34 -04:00
commit 54da52fa77
3 changed files with 3 additions and 4 deletions

View file

@ -688,8 +688,7 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
if isinstance(defaultValue, IDLNullValue):
assert(type.nullable())
return handleDefault(conversionCode,
"${declName}.SetNull();")
return handleDefault(conversionCode, "${declName} = None;")
value = "str::from_utf8(data).unwrap().to_owned()"
if type.nullable():