fix:1.blockly logic modules add parentheses

Author: SchoolMater

xarm/tools/blockly/_blockly_base.py

@@ -228,7 +228,7 @@ def __get_logic_compare(self, block, arg_map=None):
             cond_a = self._get_condition_expression(values[0], arg_map=arg_map)
             if len(values) > 1:
                 cond_b = self._get_condition_expression(values[1], arg_map=arg_map)
-        return '{} {} {}'.format(cond_a, op, cond_b)
+        return '({}) {} ({})'.format(cond_a, op, cond_b)
 
     def __get_logic_operation(self, block, arg_map=None):
         op = self._get_node('field', block).text.lower()
@@ -239,7 +239,7 @@ def __get_logic_operation(self, block, arg_map=None):
             cond_a = self._get_condition_expression(values[0], arg_map=arg_map)
             if len(values) > 1:
                 cond_b = self._get_condition_expression(values[1], arg_map=arg_map)
-        return '{} {} {}'.format(cond_a, op, cond_b)
+        return '({}) {} ({})'.format(cond_a, op, cond_b)
 
     def __get_math_arithmetic(self, block, arg_map=None):
         field = self._get_node('field', block).text

xarm/tools/blockly/_blockly_handler.py

@@ -1119,7 +1119,7 @@ def _handle_python_code(self, block, indent=0, arg_map=None, **kwargs):
                 prev_is_empty = False
             if (self._is_exec or (not self._is_exec and not self._is_ide)) and code.strip() and code not in \
                     ['finally:', 'else:'] and all([i not in code for i in ['elif', 'except', 'def', 'class']]) \
-                    and not code.startswith('@')::
+                    and not code.startswith('@'):
                 code_indent = re.match('(\s*).*', code).group(1)
                 self._append_main_code(code_indent + 'if not self.is_alive:', indent + 2)
                 self._append_main_code(code_indent + 'return', indent + 3)