Changeset 439

Timestamp:

10/14/09 14:19:04 (3 years ago)

Author:

apdavison

Message:

Tiny change in parameters module to give better error message

Files:

• trunk/src/parameters.py (modified) (2 diffs)

trunk/src/parameters.py

@@ -159 +159 @@
     
     @staticmethod
-    def read_from_str(str):
-        """
-        ParameterSet definition str should be a Python dict definition
+    def read_from_str(s):
+        """
+        ParameterSet definition s should be a Python dict definition
         string, containing objects of types int, float, str, list,
         dict plus the classes defined in this module, `Parameter`,
@@ -187 +187 @@
                                 pi=numpy.pi))            
         try:
-            D = eval(str, global_dict)
-        except SyntaxError:
-            raise SyntaxError("Invalid string for ParameterSet definition: %s" % str)
+            D = eval(s, global_dict)
+        except SyntaxError, e:
+            raise SyntaxError("Invalid string for ParameterSet definition: %s\n%s" % (s,e))
         return D or {}