1 files changed, 13 insertions, 8 deletions
diff --git a/testapp/exam/language_registry.py b/testapp/exam/language_registry.py
index 8700d32..76a23d7 100644
--- a/testapp/exam/language_registry.py
+++ b/testapp/exam/language_registry.py
@@ -1,31 +1,36 @@
-from settings import language_register
+from settings import code_evaluators
+import importlib
 
 registry = None
 
 def set_registry():
-    globals registry = _LanguageRegistry()
+    global registry
+    registry = _LanguageRegistry()
     
 def get_registry():
     return registry
 
 class _LanguageRegistry(object):
     def __init__(self):
-        for language, module in language_register.iteritems():
+        self._register = {}
+        for language, module in code_evaluators.iteritems():
             self._register[language] = None
 
     # Public Protocol ##########
     def get_class(self, language):
-        if not self._register[language]:
-            self._register[language] = language_register[language]
+        """ Get the code evaluator class for the given language """
+        if not self._register.get(language):
+            self._register[language] = code_evaluators.get(language)
 
         cls = self._register[language]
-        module_name, class_name = cls.split(".")
+        module_name, class_name = cls.rsplit(".", 1)
         # load the module, will raise ImportError if module cannot be loaded
         get_module = importlib.import_module(module_name)
         # get the class, will raise AttributeError if class cannot be found
         get_class = getattr(get_module, class_name)
         return get_class
 
-    # def register(self, language, cls):
-    #     self._register[language] = cls
+    def register(self, language, class_name):
+        """ Register a new code evaluator class for language"""
+        self._register[language] = class_name