Get robot code to generate correctly

Author: alan412

src/blocks/mrc_class_method_def.ts

@@ -362,12 +362,12 @@ export const pythonFromBlock = function (
     }
     if (block.mrcPythonMethodName == '__init__') {
         let class_specific = generator.getClassSpecificForInit();
-        branch = generator.INDENT + 'super.__init__(' + class_specific + ')\n' +
+        branch = generator.INDENT + 'super().__init__(' + class_specific + ')\n' +
             generator.defineClassVariables() + branch;
     }
     else if (generator.inBaseClassMethod(blocklyName)){
         // Special case for update, to also call the update method of the base class
-        branch = generator.INDENT + 'super.' + blocklyName + '()\n' + branch;
+        branch = generator.INDENT + 'super().' + blocklyName + '()\n' + branch;
     }
     if (returnValue) {
         returnValue = generator.INDENT + 'return ' + returnValue + '\n';

src/blocks/mrc_mechanism_component_holder.ts

@@ -178,7 +178,7 @@ export const setup = function () {
 }
 
 function pythonFromBlockInRobot(block: MechanismComponentHolderBlock, generator: ExtendedPythonGenerator) {
-  let code = 'def define_hardware(self):\n' + generator.INDENT + 'self.hardware = []\n';
+  let code = 'def define_hardware(self):\n';
 
   let mechanisms = '';
   let components = '';
@@ -189,23 +189,21 @@ function pythonFromBlockInRobot(block: MechanismComponentHolderBlock, generator:
   const body = mechanisms + components;
   if (body != '') {
     code += body;
+    generator.addClassMethodDefinition('define_hardware', code);    
   } 
-
-  generator.addClassMethodDefinition('define_hardware', code);
 }
 
 function pythonFromBlockInMechanism(block: MechanismComponentHolderBlock, generator: ExtendedPythonGenerator) {
   let components = '';
 
   components = generator.statementToCode(block, 'COMPONENTS');
 
-  let code = 'def define_hardware(self' + generator.getListOfPorts(false) + '):\n' +
-    generator.INDENT + 'self.hardware = []\n';
+  let code = 'def define_hardware(self' + generator.getListOfPorts(false) + '):\n';
 
   if (components != '') {
     code += components;
-  } 
-  generator.addClassMethodDefinition('define_hardware', code);
+    generator.addClassMethodDefinition('define_hardware', code);    
+  }
 }
 
 export const pythonFromBlock = function (

src/editor/extended_python_generator.ts

@@ -84,9 +84,11 @@ export class ExtendedPythonGenerator extends PythonGenerator {
     let variableDefinitions = '';
 
     if (this.context?.getHasHardware()) {
-      variableDefinitions += this.INDENT + "self.define_hardware(";
-      variableDefinitions += this.getListOfPorts(true);
-      variableDefinitions += ')\n';
+      if ('define_hardware' in this.classMethods) {
+        variableDefinitions += this.INDENT + "self.define_hardware(";
+        variableDefinitions += this.getListOfPorts(true);
+        variableDefinitions += ')\n';
+      }
       if (this.events && Object.keys(this.events).length > 0){
         variableDefinitions += this.INDENT + "self.register_events()\n";
       }
@@ -129,7 +131,14 @@ export class ExtendedPythonGenerator extends PythonGenerator {
    * Add an import statement for a python module.
    */
   addImport(importModule: string): void {
-    this.definitions_['import_' + importModule] = 'import ' + importModule;
+    const baseClasses = ['RobotBase', 'OpMode', 'Mechanism'];
+    if (baseClasses.includes(importModule)) {
+      this.definitions_['import_' + importModule] = 'from blocks_base_classes import ' + importModule;
+    }
+    else{
+      this.definitions_['import_' + importModule] = 'import ' + importModule;
+    }
+
   }
 
   /**