From ac8d6720bc75676e05462cc38ad144d5aedc14e7 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Wed, 21 Sep 2016 15:07:43 +0530
Subject: Migrate python code server and evaluators to python 2/3 compatible

---
 yaksh/scilab_code_evaluator.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'yaksh/scilab_code_evaluator.py')

diff --git a/yaksh/scilab_code_evaluator.py b/yaksh/scilab_code_evaluator.py
index 53fa343..011cb69 100644
--- a/yaksh/scilab_code_evaluator.py
+++ b/yaksh/scilab_code_evaluator.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from __future__ import absolute_import
 import traceback
 import os
 from os.path import join, isfile
@@ -6,9 +7,9 @@ import subprocess
 import re
 import importlib
 
-# local imports
-from code_evaluator import CodeEvaluator
-from file_utils import copy_files, delete_files
+# Local imports
+from .code_evaluator import CodeEvaluator
+from .file_utils import copy_files, delete_files
 
 
 class ScilabCodeEvaluator(CodeEvaluator):
-- 
cgit 


From 6b6e58b06bd49e36edd87a027c08d223571a0c0b Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Tue, 27 Sep 2016 15:08:18 +0530
Subject: Fix test cases and corresponding changes in evaluators for Python 2/3
 compatibility

---
 yaksh/scilab_code_evaluator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'yaksh/scilab_code_evaluator.py')

diff --git a/yaksh/scilab_code_evaluator.py b/yaksh/scilab_code_evaluator.py
index 011cb69..075bf6b 100644
--- a/yaksh/scilab_code_evaluator.py
+++ b/yaksh/scilab_code_evaluator.py
@@ -20,11 +20,11 @@ class ScilabCodeEvaluator(CodeEvaluator):
             self.create_submit_code_file('function.sci')
 
     def teardown(self):
-        super(ScilabCodeEvaluator, self).teardown()
         # Delete the created file.
         os.remove(self.submit_code_path)
         if self.files:
             delete_files(self.files)
+        super(ScilabCodeEvaluator, self).teardown()
 
     def check_code(self, user_answer, file_paths, test_case):
         self.files = []
-- 
cgit 


From cb0569a32422a195d4165ef405ac5560024dabda Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Thu, 29 Sep 2016 18:10:09 +0530
Subject: Add unicode_literal import for Python2

---
 yaksh/scilab_code_evaluator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'yaksh/scilab_code_evaluator.py')

diff --git a/yaksh/scilab_code_evaluator.py b/yaksh/scilab_code_evaluator.py
index 075bf6b..915491c 100644
--- a/yaksh/scilab_code_evaluator.py
+++ b/yaksh/scilab_code_evaluator.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import absolute_import
+from __future__ import unicode_literals
 import traceback
 import os
 from os.path import join, isfile
-- 
cgit