changeset 613:7261e7d6368d

merge.
author lamblinp@ip03.m
date Fri, 16 Jan 2009 19:10:50 -0500
parents 5a7927691d2c (current diff) d0c2c33a620f (diff)
children f6c74f34cd35 a88ead1a1537
files
diffstat 1 files changed, 2 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/pylearn/dbdict/newstuff.py	Fri Jan 16 19:10:09 2009 -0500
+++ b/pylearn/dbdict/newstuff.py	Fri Jan 16 19:10:50 2009 -0500
@@ -694,10 +694,7 @@
         table_prefix = tablename)
 
     state = parse(*strings)
-    try:
-        resolve(experiment)
-    except:
-        raise UsageError('The first parameter to sqlschedule must be a valid, importable symbol.')
+    resolve(experiment) # we try to load the function associated to the experiment
     state['dbdict.experiment'] = experiment
     sql.add_experiments_to_db([state], db, verbose = 1, add_dups = options.force)
 
@@ -740,10 +737,7 @@
                 _state.update(parse(*map(str.strip, f.readlines())))
     state = _state
 
-    try:
-        resolve(experiment)
-    except:
-        raise UsageError('The first parameter to sqlschedule_filemerge must be a valid, importable symbol.')
+    resolve(experiment) # we try to load the function associated to the experiment
     state['dbdict.experiment'] = experiment
     sql.add_experiments_to_db([state], db, verbose = 1, add_dups = options.force)