Added ConfigTree.remove, adapted parse and parse_file

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

diff --git a/t/moe/config.py b/t/moe/config.py
index f24e1ef8f357748b41b13f2b8cff20419cfb90d7..04e363f1887ef53446392b202a34df97faa00630 100644 (file)
--- a/t/moe/config.py
+++ b/t/moe/config.py
@@ -1,10 +1,6 @@
 """
 """

-config.py
----------
-

 Lazy conditional string evaluation module for Moe configuration variables.
 
 Lazy conditional string evaluation module for Moe configuration variables.
 

-

 * Each variable has ordered list of operations (definitions), each defining operation either 
   assigns (SET) or appends (APPEND) value of an expression to the variable. Each operation may be guarded by condition(s). 
 
 * Each variable has ordered list of operations (definitions), each defining operation either 
   assigns (SET) or appends (APPEND) value of an expression to the variable. Each operation may be guarded by condition(s). 
 


@@ -98,19 +94,36 @@ class ConfigTree(object):
       self.variables[k].dump(prefix) for k in sorted(self.variables.keys())
       ])
 
       self.variables[k].dump(prefix) for k in sorted(self.variables.keys())
       ])
 

+  def fix(self, keys):
+    "Fix value of variable or list of variables. Fixing undefined variable raises `UndefinedError`."
+    if isinstance(keys, types.StringTypes):
+      keys = [keys]
+    for key in keys:
+      self.lookup(key, create=True).fix()
+
+  def remove(self, parsed):
+    """Given a list [(varname, `Operation`)] as returned by `parse` or `parse_file`, 
+    removes the operations from the respective variables config tree.
+    Variables/operations not present int the tree raise ValueError.
+    """
+    for vname, o in parsed:
+      v = self.lookup(vname, create = True)
+      v.remove_operation(o)
+

   def parse(self, s, source=None, level=0):
   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)
-    p.parse()
+    """Parse `s` (stream/string) into the tree, see `moe.confparser.ConfigParser` for details.
+    Returns list of parset operations: [(varname, `Operation`)]"""
+    import moe.config_parser
+    p = moe.config_parser.ConfigParser(s, self, source=source, level=level)
+    return p.parse()

 
   def parse_file(self, filename, desc=None, level=0):
     """Parse an utf-8 file into the tree, see `moe.confparser.ConfigParser` for details. 
     Names the source "`filename` <`desc`>". """
 
   def parse_file(self, filename, desc=None, level=0):
     """Parse an utf-8 file into the tree, see `moe.confparser.ConfigParser` for details. 
     Names the source "`filename` <`desc`>". """

-    f = open(filename, 'rt')
-    if desc: 
-      filename += " <" + desc + ">" 
-    self.parse(f, source=filename, level=level)
+    with open(filename, 'rt') as f:
+      if desc: 
+       filename += " <" + desc + ">" 
+      return self.parse(f, source=filename, level=level)

 
 
 class ConfigElem(object):
 
 
 class ConfigElem(object):


@@ -265,7 +278,9 @@ class ConfigVar(ConfigElem):
 
   def variables(self):
     "Return a set of variables used in the expressions"
 
   def variables(self):
     "Return a set of variables used in the expressions"

-    return set(sum([ list(op.expression.variables()) for op in self.operations ], []))
+    if not self.operations:
+      return set([])
+    return set.union(*[ op.expression.variables() for op in self.operations ])

 
   def fix(self):
     """
 
   def fix(self):
     """


@@ -278,14 +293,14 @@ class ConfigVar(ConfigElem):
     self.fixed = True
 
   def unfix(self):
     self.fixed = True
 
   def unfix(self):

-    "Set the variable to be modifiable again."
+    "Make the variable modifiable again."

     self.fixed = False
 
   def value(self, depth=0):
     "Handle the case when fixed, raise exc. on different evaluation"
     val = super(ConfigVar,self).value(depth)
     if self.fixed and self.fixed_val != val:
     self.fixed = False
 
   def value(self, depth=0):
     "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):
     return val
 
   def add_operation(self, operation):


@@ -315,7 +330,7 @@ class ConfigVar(ConfigElem):
     self.invalidate()
     # Remove the operation 
     self.operations.remove(operation)
     self.invalidate()
     # Remove the operation 
     self.operations.remove(operation)

-    # Remove dependencies on variables unused in other operations
+    # Remove dependencies on variables unused in other defining operations

     vs = self.variables()
     for v in operation.expression.variables():
       if v not in vs:
     vs = self.variables()
     for v in operation.expression.variables():
       if v not in vs:


@@ -380,8 +395,8 @@ class ConfigExpression(object):
          self.exprlist[i] = unicode(e, 'ascii')
 
   def variables(self):
          self.exprlist[i] = unicode(e, 'ascii')
 
   def variables(self):

-    "Return an iterator of variables user in the expression"
-    return itertools.ifilter(lambda e: isinstance(e, ConfigVar), self.exprlist)
+    "Return a set of variables used in the expression"
+    return set([e for e in self.exprlist if isinstance(e, ConfigVar)])

 
   def __str__(self):
     return self.original
 
   def __str__(self):
     return self.original