[yt-svn] commit/yt: 4 new changesets

[commits-noreply at bitbucket.org]

4 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/7f6bd9115939/
Changeset:   7f6bd9115939
User:        Josh Borrow
Date:        2017-10-11 16:10:42+00:00
Summary:     Fixes issue #1584
Affected #:  1 file

diff -r 0231a9c04ac1101ef070028c7af3f71684643597 -r 7f6bd911593981f295a9785d9789e23e540e8b34 yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -781,7 +781,7 @@
 
     def _parse_enzo2_parameter_file(self, f):
         for line in (l.strip() for l in f):
-            if len(line) < 2: continue
+            if (len(line) < 2) or (line[0] == "#"): continue
             param, vals = (i.strip() for i in line.split("=",1))
             # First we try to decipher what type of value it is.
             vals = vals.split()


https://bitbucket.org/yt_analysis/yt/commits/cb34126ee5d3/
Changeset:   cb34126ee5d3
User:        Josh Borrow
Date:        2017-10-11 16:52:12+00:00
Summary:     Removed leading spaces from the string that is checked for comments
Affected #:  1 file

diff -r 7f6bd911593981f295a9785d9789e23e540e8b34 -r cb34126ee5d33a5df0bb07393820bf42733707e5 yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -781,7 +781,7 @@
 
     def _parse_enzo2_parameter_file(self, f):
         for line in (l.strip() for l in f):
-            if (len(line) < 2) or (line[0] == "#"): continue
+            if (len(line) < 2) or (line.lstrip()[0] == "#"): continue
             param, vals = (i.strip() for i in line.split("=",1))
             # First we try to decipher what type of value it is.
             vals = vals.split()


https://bitbucket.org/yt_analysis/yt/commits/8ca1c7be6a03/
Changeset:   8ca1c7be6a03
User:        Josh Borrow
Date:        2017-10-13 20:48:10+00:00
Summary:     Changed to searching for '=' signs as lines starting with # are actually valid in enzo:
Affected #:  1 file

diff -r cb34126ee5d33a5df0bb07393820bf42733707e5 -r 8ca1c7be6a03b91f40fe7b2b1a8fea49c938e000 yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -781,7 +781,7 @@
 
     def _parse_enzo2_parameter_file(self, f):
         for line in (l.strip() for l in f):
-            if (len(line) < 2) or (line.lstrip()[0] == "#"): continue
+            if (len(line) < 2) or ("=" not in line): continue
             param, vals = (i.strip() for i in line.split("=",1))
             # First we try to decipher what type of value it is.
             vals = vals.split()


https://bitbucket.org/yt_analysis/yt/commits/1f6f5965a37b/
Changeset:   1f6f5965a37b
User:        ngoldbaum
Date:        2017-10-14 01:17:38+00:00
Summary:     Merge pull request #1586 from JBorrow/fix-enzo-loading

Fixes issue #1584
Affected #:  1 file

diff -r 0faca88b46a92ce153a5fac58b654fbd7e6fcc5c -r 1f6f5965a37b0835b4817329ebfcdab7e42b72af yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -781,7 +781,7 @@
 
     def _parse_enzo2_parameter_file(self, f):
         for line in (l.strip() for l in f):
-            if len(line) < 2: continue
+            if (len(line) < 2) or ("=" not in line): continue
             param, vals = (i.strip() for i in line.split("=",1))
             # First we try to decipher what type of value it is.
             vals = vals.split()

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.