diff options
| author | adityacp | 2016-12-23 15:03:37 +0530 |
|---|---|---|
| committer | adityacp | 2016-12-23 15:03:37 +0530 |
| commit | d442941819dc7f8b65a2965fbcefe000fea1cde2 (patch) | |
| tree | 624d8ba12cf83cf57f685bc8cee158be14aee783 /yaksh/scilab_code_evaluator.py | |
| parent | 14b628f49a7d0aa58c22c021c62a5d0a748ae881 (diff) | |
| parent | 48366e84b98157ac32b22b2aa19b1c1cde68afd4 (diff) | |
| download | online_test-d442941819dc7f8b65a2965fbcefe000fea1cde2.tar.gz online_test-d442941819dc7f8b65a2965fbcefe000fea1cde2.tar.bz2 online_test-d442941819dc7f8b65a2965fbcefe000fea1cde2.zip | |
Fix conflict
Diffstat (limited to 'yaksh/scilab_code_evaluator.py')
| -rw-r--r-- | yaksh/scilab_code_evaluator.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/yaksh/scilab_code_evaluator.py b/yaksh/scilab_code_evaluator.py index 4584a06..7ffcd2b 100644 --- a/yaksh/scilab_code_evaluator.py +++ b/yaksh/scilab_code_evaluator.py @@ -74,7 +74,7 @@ class ScilabCodeEvaluator(BaseEvaluator): # Clean output stdout = self._strip_output(stdout) if proc.returncode == 5: - success, err = True, "Correct answer" + success, err = True, None test_case_weight = float(self.weight) if self.partial_grading else 0.0 else: err = add_err + stdout |