Merge pull request #1918 from OpenC3/python_multi_line_generic_conversion

Fix multi line generic conversions in Python

Author: ryanmelt

openc3/python/openc3/conversions/generic_conversion.py

@@ -50,10 +50,18 @@ def __init__(
             self.converted_array_size = int(converted_array_size)
         self.params = [code_to_eval, converted_type, converted_bit_size, converted_array_size]
 
+        # Setup multiline eval where the last line defines the return value for eval
+        lines = code_to_eval.splitlines()
+        exec_lines = lines[0:(len(lines) - 1)]
+        self.exec_lines = compile("\n".join(exec_lines), "<string>", "exec")
+        self.eval_line = compile(lines[-1], "<string>", "eval")
+
     def call(self, value, packet, buffer):
         myself = packet  # For backwards compatibility
         if myself:  # Remove unused variable warning for myself
-            return eval(self.code_to_eval)
+            generic_globals = {"value": value, "myself": myself, "packet": packet, "buffer": buffer}
+            exec(self.exec_lines, generic_globals)
+            return eval(self.eval_line, generic_globals)
 
     # self.return [String] The conversion class followed by the code to evaluate
     def __str__(self):

openc3/python/test/conversions/test_generic_conversion.py

@@ -52,3 +52,11 @@ def test_creates_a_reproducable_format(self):
         self.assertEqual(gc.converted_array_size, (new_gc.converted_array_size))
         self.assertEqual(gc.call(0, pkt, 0), 5.0)
         self.assertEqual(new_gc.call(0, pkt, 0), 5.0)
+
+    def test_multiple_lines(self):
+        gc = GenericConversion("x = 10\ny = 2\nx / y", "UINT", 8)
+        self.assertEqual(gc.call(0, Packet(None, None), 0), 5)
+        gc = GenericConversion("x = 10\ny = 2\nx / y / value", "UINT", 8)
+        self.assertEqual(gc.call(5, Packet(None, None), 0), 1)
+        gc = GenericConversion("import math\nx = 10\ny = 2\nmath.ceil(x / y / value)", "UINT", 8)
+        self.assertEqual(gc.call(2, Packet(None, None), 0), 3)