cleanup

Author: jlwalke2

src/sasctl/utils/pymas/core.py

@@ -69,7 +69,7 @@ def build_wrapper_function(func, variables, array_input, setup=None,
     if array_input:
         middle = string_input +\
                  ('        inputarray = np.array([{}]).reshape((1, -1))'.format(','.join(args)),
-                  '        column = [{}]'.format(','.join(str(w) for w in args)),
+                  '        column = [{}]'.format(','.join('"{0}"'.format(w) for w in args)),
                   '        import pandas as pd',
                   '        inputrun = pd.DataFrame(data=inputarray, columns=column)',
                   '        result = {}(inputrun)'.format(func))

tests/integration/test_pymas.py

@@ -186,9 +186,9 @@ def test_from_pickle(train_data, pickle_file):
                 rc = py.appendSrcLine('        import numpy as np');
                 rc = py.appendSrcLine('');
                 rc = py.appendSrcLine('        inputarray = np.array([SepalLength,SepalWidth,PetalLength,PetalWidth]).reshape((1, -1))');
-                rc = py.appendSrcLine('        column=["SepalLength","SepalWidth","PetalLength","PetalWidth"]');
+                rc = py.appendSrcLine('        column = ["SepalLength","SepalWidth","PetalLength","PetalWidth"]');
                 rc = py.appendSrcLine('        import pandas as pd');
-                rc = py.appendSrcLine('        inputrun=pd.DataFrame(data=inputarray, columns=column)');
+                rc = py.appendSrcLine('        inputrun = pd.DataFrame(data=inputarray, columns=column)');
                 rc = py.appendSrcLine('        result = obj.predict(inputrun)');
                 rc = py.appendSrcLine('        if result.size == 1:');
                 rc = py.appendSrcLine('            result = np.asscalar(result)');