Mercurial > pylearn

changeset 595:7ddb286162f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
corrected filemerge
author Olivier Breuleux <breuleuo@iro.umontreal.ca>
date Mon, 12 Jan 2009 18:46:46 -0500
parents 86a63770af24
children 605ab704abc3
files pylearn/dbdict/newstuff.py
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/pylearn/dbdict/newstuff.py	Thu Dec 18 20:10:35 2008 -0500
+++ b/pylearn/dbdict/newstuff.py	Mon Jan 12 18:46:46 2009 -0500
@@ -590,8 +590,11 @@
     with open(mainfile) as f:
         _state = parse(*map(str.strip, f.readlines()))
     for file in other_files:
-        with open(file) as f:
-            _state.update(parse(*map(str.strip, f.readlines())))
+        if '=' in file:
+            _state.update(parse(file))
+        else:
+            with open(file) as f:
+                _state.update(parse(*map(str.strip, f.readlines())))
     state = expand(_state)
     state.setdefault('dbdict', DD()).experiment = experiment
     experiment = resolve(experiment)