Many changes to pipeline.py

[moe.git] / t / moe / config.py

diff --git a/t/moe/config.py b/t/moe/config.py
index 1de679904a3b8a92f1ed3fdf19ffdb02408042dd..dacaf42a7a1450e45fa505c266cb7fecc1b01e1d 100644 (file)
--- a/t/moe/config.py
+++ b/t/moe/config.py
@@ -103,8 +103,8 @@ class ConfigTree(object):
 
   def parse(self, s, source=None, level=0):
     """Parse `s` (stream/string) into the tree, see `moe.confparser.ConfigParser` for details."""
-    import moe.confparser
-    p = moe.confparser.ConfigParser(text, self, source=source, level=level)
+    import moe.config_parser
+    p = moe.config_parser.ConfigParser(s, self, source=source, level=level)
     p.parse()
 
   def parse_file(self, filename, desc=None, level=0):
@@ -288,7 +288,7 @@ class ConfigVar(ConfigElem):
     "Handle the case when fixed, raise exc. on different evaluation"
     val = super(ConfigVar,self).value(depth)
     if self.fixed and self.fixed_val != val:
-      raise VariableFixedError("value of var %s was fixed to %r but evaluated to %r", self.name, self.fixed_val, val)
+      raise VariableFixedError("value of var %r was fixed to %r but evaluated to %r", self.name, self.fixed_val, val)
     return val
 
   def add_operation(self, operation):