Merge branch 'master' of https://github.com/FOSSEE/online_test into student-interface

Resolved
Conflicts:
	yaksh/templates/yaksh/question.html

Added testarea back for now.

1 files changed, 15 insertions, 9 deletions

diff --git a/yaksh/python_stdio_evaluator.py b/yaksh/python_stdio_evaluator.py
index cbbbfd6..1506685 100644
--- a/yaksh/python_stdio_evaluator.py
+++ b/yaksh/python_stdio_evaluator.py
@@ -31,6 +31,10 @@ def redirect_stdout():
 class PythonStdioEvaluator(CodeEvaluator):
     """Tests the Python code obtained from Code Server"""
 
+    def setup(self):
+        super(PythonStdioEvaluator, self).setup()
+        self.files = []
+
     def teardown(self):
         # Delete the created file.
         if self.files:
@@ -38,8 +42,7 @@ class PythonStdioEvaluator(CodeEvaluator):
         super(PythonStdioEvaluator, self).teardown()
 
 
-    def compile_code(self, user_answer, file_paths, expected_input, expected_output):
-        self.files = []
+    def compile_code(self, user_answer, file_paths, expected_input, expected_output, weight):
         if file_paths:
             self.files = copy_files(file_paths)
         submitted = compile(user_answer, '<string>', mode='exec')
@@ -54,13 +57,16 @@ class PythonStdioEvaluator(CodeEvaluator):
         self.output_value = output_buffer.getvalue().rstrip("\n")
         return self.output_value
 
-    def check_code(self, user_answer, file_paths, expected_input, expected_output):
+    def check_code(self, user_answer, file_paths, partial_grading, expected_input,
+         expected_output, weight):
         success = False
+        test_case_weight = 0.0
 
         tb = None
         if self.output_value == expected_output:
             success = True
             err = "Correct answer"
+            test_case_weight = weight
         else:
             success = False
             err = dedent("""
@@ -68,10 +74,10 @@ class PythonStdioEvaluator(CodeEvaluator):
                 Given input - {0}
                 Expected output - {1}
                 Your output - {2}
-                """
-                         .format(expected_input,
-                                 expected_output, self.output_value
-                                 )
-                         )
+                """.format(expected_input,
+                     expected_output,
+                     self.output_value
+                    )
+                )
         del tb
-        return success, err
+        return success, err, test_case_weight