Multiple fixes in stdio_evaluator and models:

- Change the way stdio output is printed
- Fix minor errors when creating the uploaded file path in the models

1 files changed, 7 insertions, 7 deletions

diff --git a/yaksh/stdio_evaluator.py b/yaksh/stdio_evaluator.py
index fb9dfb3..fa78a68 100644
--- a/yaksh/stdio_evaluator.py
+++ b/yaksh/stdio_evaluator.py
@@ -14,17 +14,17 @@ class StdIOEvaluator(BaseEvaluator):
         output_err = output_err_bytes.decode('utf-8')
         expected_output = expected_output.replace("\r", "")
         if not expected_input:
-            error_msg = "Expected Output is {0} ".\
-                        format(repr(expected_output))
+            error_msg = "Expected Output is\n{0} ".\
+                        format(str(expected_output))
         else:
-            error_msg = " Given Input is\n {0} \n Expected Output is {1} ".\
-                        format(expected_input, repr(expected_output))
+            error_msg = "Given Input is\n{0}\nExpected Output is\n{1}".\
+                        format(expected_input, str(expected_output))
         if output_err == '':
             if user_output == expected_output:
                 success, err = True, None
             else:
-                err = " Incorrect answer\n" + error_msg +\
-                      "\n Your output is {0}".format(repr(user_output))
+                err = "Incorrect answer:\n" + error_msg +\
+                      "\nYour output is\n{0}".format(str(user_output))
         else:
-            err = "Error:\n {0}".format(output_err)
+            err = "Error:\n{0}".format(output_err)
         return success, err