From 24db3d6821fba560da4c3a4ca03f96ba6daae5a6 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Wed, 15 Mar 2017 16:48:28 +0530
Subject: 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

---
 yaksh/models.py          |  2 +-
 yaksh/stdio_evaluator.py | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'yaksh')

diff --git a/yaksh/models.py b/yaksh/models.py
index 398f508..103504e 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -66,7 +66,7 @@ test_status = (
 
 def get_assignment_dir(instance, filename):
     return os.sep.join((
-        instance.user.user, instance.assignmentQuestion.id, filename
+        instance.user.user.username, str(instance.assignmentQuestion.id), filename
     ))
 
 
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
-- 
cgit