Changeset 456 for branches/parameter_set_schema_validation/src/parameters/__init__.py

Timestamp:

08/25/10 17:28:08 (21 months ago)

Author:

emuller

Message:

ParameterSchema? and basic validation implemented.

Files:

• branches/parameter_set_schema_validation/src/parameters/__init__.py (modified) (5 diffs)

branches/parameter_set_schema_validation/src/parameters/__init__.py

@@ -193 +193 @@
             global_dict.update(update_namespace)
 
+        
+        D=None
         try:
             D = eval(s, global_dict)
-        except SyntaxError, e:
+        except SyntaxError as e:
             raise SyntaxError("Invalid string for ParameterSet definition: %s\n%s" % (s,e))
+            
         return D or {}
     
@@ -229 +232 @@
                 pstr = f.read()
                 self._url = initialiser
+
+                
             except IOError:
                 pstr = initialiser
@@ -235 +240 @@
                 f.close()
 
-            initialiser = ParameterSet.read_from_str(pstr,update_namespace)
+
+            # is it a yaml url?
+            if self._url:
+                import urlparse, os.path
+                o = urlparse.urlparse(self._url)
+                base,ext = os.path.splitext(o.path)
+                if ext in ['.yaml','.yml']:
+                    import yaml
+                    initialiser = yaml.load(pstr)
+                else:
+                    initialiser = ParameterSet.read_from_str(pstr,update_namespace)
+            else:
+                initialiser = ParameterSet.read_from_str(pstr,update_namespace)
+
         
         # By this stage, `initialiser` should be a dict. Iterate through it,
@@ -297 +315 @@
         return dict.__getitem__(self,split[0])[split[1]]
 
+    def flat_add(self,name,value):
+        """ Like __setitem__, but it will add ParametSet({}) objects
+        into the namespace tree if needed. """
+
+        split = name.split('.',1)
+        if len(split)==1:
+            dict.__setitem__(self,name,value)
+        else:
+            # nested set
+            try:
+                ps = dict.__getitem__(self,split[0])
+            except KeyError:
+                # setting nested name without parent existing
+                # create parent
+                ps = ParameterSet({})
+                dict.__setitem__(self,split[0],ps)
+                # and try again
+            ps.flat_add(split[1],value)
+
     def __setitem__(self,name,value):
         """ Modified set that detects dots '.' in the names and goes down the
@@ -306 +343 @@
         else:
             # nested set
-            try:
-                dict.__getitem__(self,split[0])[split[1]]=value
-            except KeyError:
-                # setting nested name without parent existing
-                # create parent
-                dict.__setitem__(self,split[0],{})
-                # and try again
-                dict.__getitem__(self,split[0])[split[1]]=value
+            dict.__getitem__(self,split[0])[split[1]]=value
+
    
     # should __len__() be the usual dict length, or the flattened length? Probably the former for consistency with dicts