Mercurial > pylearn

changeset 594:86a63770af24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed small bug with filemerge
author Olivier Breuleux <breuleuo@iro.umontreal.ca>
date Thu, 18 Dec 2008 20:10:35 -0500
parents 5398a7a1eca7
children 7ddb286162f6
files pylearn/dbdict/newstuff.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/pylearn/dbdict/newstuff.py	Thu Dec 18 18:09:23 2008 -0500
+++ b/pylearn/dbdict/newstuff.py	Thu Dec 18 20:10:35 2008 -0500
@@ -588,10 +588,11 @@
         number=12 numbers.a=55 numbers.b=56
     """
     with open(mainfile) as f:
-        state = expand(parse(*map(str.strip, f.readlines())))
+        _state = parse(*map(str.strip, f.readlines()))
     for file in other_files:
         with open(file) as f:
-            state.update(expand(parse(*map(str.strip, f.readlines()))))
+            _state.update(parse(*map(str.strip, f.readlines())))
+    state = expand(_state)
     state.setdefault('dbdict', DD()).experiment = experiment
     experiment = resolve(experiment)
     if options.workdir and options.dry_run: