Merge branch 'master' of https://github.com/FOSSEE/online_test into edit_questionpaper

Resolved
Conflicts:
	yaksh/views.py

1 files changed, 6 insertions, 2 deletions

diff --git a/yaksh/language_registry.py b/yaksh/language_registry.py
index 398e1aa..0e0140b 100644
--- a/yaksh/language_registry.py
+++ b/yaksh/language_registry.py
@@ -1,6 +1,10 @@
-from settings import code_evaluators
+from __future__ import unicode_literals
 import importlib
 import json
+import six  
+
+# Local imports
+from .settings import code_evaluators
 
 registry = None
     
@@ -24,7 +28,7 @@ def create_evaluator_instance(language, test_case_type, json_data, in_dir):
 class _LanguageRegistry(object):
     def __init__(self):
         self._register = {}
-        for language, module in code_evaluators.iteritems():
+        for language, module in six.iteritems(code_evaluators):
             self._register[language] = None
 
     # Public Protocol ##########