Add unicode_literal import for Python2

21 files changed, 21 insertions, 23 deletions

diff --git a/yaksh/bash_code_evaluator.py b/yaksh/bash_code_evaluator.py
index 0cbce89..e148fa8 100644
--- a/yaksh/bash_code_evaluator.py
+++ b/yaksh/bash_code_evaluator.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import absolute_import
+from __future__ import unicode_literals
 import traceback
 import pwd
 import os
diff --git a/yaksh/bash_stdio_evaluator.py b/yaksh/bash_stdio_evaluator.py
index fbb94ec..8545ccb 100644
--- a/yaksh/bash_stdio_evaluator.py
+++ b/yaksh/bash_stdio_evaluator.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import absolute_import
+from __future__ import unicode_literals
 import subprocess
 import os
 from os.path import isfile
diff --git a/yaksh/code_evaluator.py b/yaksh/code_evaluator.py
index b4740c0..90ca6e0 100644
--- a/yaksh/code_evaluator.py
+++ b/yaksh/code_evaluator.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import absolute_import
+from __future__ import unicode_literals
 import sys
 import pwd
 import os
diff --git a/yaksh/code_server.py b/yaksh/code_server.py
index b753ac7..b3c9c30 100755
--- a/yaksh/code_server.py
+++ b/yaksh/code_server.py
@@ -23,7 +23,7 @@ that returns an available server.
 """
 
 # Standard library imports
-from __future__ import absolute_import
+from __future__ import unicode_literals
 import json
 from multiprocessing import Process, Queue
 import os
diff --git a/yaksh/cpp_code_evaluator.py b/yaksh/cpp_code_evaluator.py
index adef658..5380dea 100644
--- a/yaksh/cpp_code_evaluator.py
+++ b/yaksh/cpp_code_evaluator.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import absolute_import
+from __future__ import unicode_literals
 import traceback
 import pwd
 import os
diff --git a/yaksh/cpp_stdio_evaluator.py b/yaksh/cpp_stdio_evaluator.py
index 64de54d..d2fa281 100644
--- a/yaksh/cpp_stdio_evaluator.py
+++ b/yaksh/cpp_stdio_evaluator.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import absolute_import
+from __future__ import unicode_literals
 import subprocess
 import os
 from os.path import isfile
diff --git a/yaksh/evaluator_tests/test_bash_evaluation.py b/yaksh/evaluator_tests/test_bash_evaluation.py
index 7fdff48..25fe18d 100755
--- a/yaksh/evaluator_tests/test_bash_evaluation.py
+++ b/yaksh/evaluator_tests/test_bash_evaluation.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 import unittest
 import os
 import shutil
diff --git a/yaksh/evaluator_tests/test_code_evaluation.py b/yaksh/evaluator_tests/test_code_evaluation.py
index 4efe119..88e0253 100644
--- a/yaksh/evaluator_tests/test_code_evaluation.py
+++ b/yaksh/evaluator_tests/test_code_evaluation.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 import unittest
 import os
 from yaksh import python_assertion_evaluator
diff --git a/yaksh/evaluator_tests/test_java_evaluation.py b/yaksh/evaluator_tests/test_java_evaluation.py
index a9708e8..ebe05b8 100755
--- a/yaksh/evaluator_tests/test_java_evaluation.py
+++ b/yaksh/evaluator_tests/test_java_evaluation.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 import unittest
 import os
 import shutil
diff --git a/yaksh/evaluator_tests/test_python_evaluation.py b/yaksh/evaluator_tests/test_python_evaluation.py
index b93aa13..45cc40d 100755
--- a/yaksh/evaluator_tests/test_python_evaluation.py
+++ b/yaksh/evaluator_tests/test_python_evaluation.py
@@ -1,5 +1,4 @@
-from __future__ import absolute_import
-from six.moves import input
+from __future__ import unicode_literals
 import unittest
 import os
 import tempfile
diff --git a/yaksh/evaluator_tests/test_scilab_evaluation.py b/yaksh/evaluator_tests/test_scilab_evaluation.py
index 0bb7bfd..b366480 100644
--- a/yaksh/evaluator_tests/test_scilab_evaluation.py
+++ b/yaksh/evaluator_tests/test_scilab_evaluation.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 import unittest
 import os
 import shutil
diff --git a/yaksh/file_utils.py b/yaksh/file_utils.py
index 82956bf..afcf9e8 100644
--- a/yaksh/file_utils.py
+++ b/yaksh/file_utils.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import shutil
 import os
 import zipfile
diff --git a/yaksh/java_code_evaluator.py b/yaksh/java_code_evaluator.py
index a294b8e..1ce1c0e 100644
--- a/yaksh/java_code_evaluator.py
+++ b/yaksh/java_code_evaluator.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import absolute_import
+from __future__ import unicode_literals
 import traceback
 import pwd
 import os
diff --git a/yaksh/java_stdio_evaluator.py b/yaksh/java_stdio_evaluator.py
index b5a52f3..3199885 100644
--- a/yaksh/java_stdio_evaluator.py
+++ b/yaksh/java_stdio_evaluator.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import absolute_import
+from __future__ import unicode_literals
 import subprocess
 import os
 from os.path import isfile
diff --git a/yaksh/language_registry.py b/yaksh/language_registry.py
index 5b2b519..0e0140b 100644
--- a/yaksh/language_registry.py
+++ b/yaksh/language_registry.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 import importlib
 import json
 import six  
diff --git a/yaksh/python_assertion_evaluator.py b/yaksh/python_assertion_evaluator.py
index 4f159bf..dd1c041 100644
--- a/yaksh/python_assertion_evaluator.py
+++ b/yaksh/python_assertion_evaluator.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
-from __future__ import absolute_import
-from six.moves import input
+from __future__ import unicode_literals
 import sys
 import traceback
 import os
diff --git a/yaksh/python_stdio_evaluator.py b/yaksh/python_stdio_evaluator.py
index 5f672e2..cbbbfd6 100644
--- a/yaksh/python_stdio_evaluator.py
+++ b/yaksh/python_stdio_evaluator.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import absolute_import
+from __future__ import unicode_literals
 import sys
 import traceback
 import os
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
diff --git a/yaksh/stdio_evaluator.py b/yaksh/stdio_evaluator.py
index b5924ff..326d2e7 100644
--- a/yaksh/stdio_evaluator.py
+++ b/yaksh/stdio_evaluator.py
@@ -1,9 +1,10 @@
+from __future__ import unicode_literals
+
 # Local imports
 from code_evaluator import CodeEvaluator
 
 
 class StdIOEvaluator(CodeEvaluator):
-
     def setup(self):
         super(StdIOEvaluator, self).setup()
         pass
diff --git a/yaksh/tests/test_code_server.py b/yaksh/tests/test_code_server.py
index 1d6584b..8835110 100644
--- a/yaksh/tests/test_code_server.py
+++ b/yaksh/tests/test_code_server.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 import json
 try:
     from Queue import Queue
diff --git a/yaksh/xmlrpc_clients.py b/yaksh/xmlrpc_clients.py
index 83ba277..4da70dd 100644
--- a/yaksh/xmlrpc_clients.py
+++ b/yaksh/xmlrpc_clients.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 import time
 import random
 import socket