Merge remote-tracking branch 'upstream/develop' into feature/variable_management_merge_develop

This commit is contained in:
Rachel Fenichel
2016-08-08 16:58:51 -07:00
78 changed files with 3293 additions and 2205 deletions

View File

@@ -71,7 +71,6 @@ Blockly.Python['procedures_defreturn'] = function(block) {
}
var code = 'def ' + funcName + '(' + args.join(', ') + '):\n' +
globals + branch + returnValue;
code = Blockly.Python.scrub_(block, code);
// Add % so as not to collide with helper functions in definitions list.
Blockly.Python.definitions_['%' + funcName] = code;
return null;