[yt-svn] commit/yt: chummels: Merged in jzuhone/yt (pull request #1645)

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/eef682fe125d/
Changeset:   eef682fe125d
Branch:      yt
User:        chummels
Date:        2015-07-17 19:23:45+00:00
Summary:     Merged in jzuhone/yt (pull request #1645)

[bugfix] Fixing GadgetFOF Python 3 test failures
Affected #:  2 files

diff -r 8b4c23e54b7ccb86ab369b9bc02217faa5896b3a -r eef682fe125dc8f36c86c89453fc7ab6481c994d yt/frontends/gadget_fof/io.py
--- a/yt/frontends/gadget_fof/io.py
+++ b/yt/frontends/gadget_fof/io.py
@@ -183,7 +183,7 @@
                 my_div = fh[field].size / pcount[ptype]
                 fname = fh[field].name[fh[field].name.find(ptype) + len(ptype) + 1:]
                 if my_div > 1:
-                    for i in range(my_div):
+                    for i in range(int(my_div)):
                         fields.append((ptype, "%s_%d" % (fname, i)))
                 else:
                     fields.append((ptype, fname))
@@ -195,7 +195,7 @@
                 my_div = fh[field].size / fh["/Subfind"].attrs["Number_of_groups"]
                 fname = fh[field].name[fh[field].name.find(ptype) + len(ptype) + 1:]
                 if my_div > 1:
-                    for i in range(my_div):
+                    for i in range(int(my_div)):
                         fields.append(("Group", "%s_%d" % (fname, i)))
                 else:
                     fields.append(("Group", fname))

diff -r 8b4c23e54b7ccb86ab369b9bc02217faa5896b3a -r eef682fe125dc8f36c86c89453fc7ab6481c994d yt/frontends/owls_subfind/io.py
--- a/yt/frontends/owls_subfind/io.py
+++ b/yt/frontends/owls_subfind/io.py
@@ -193,7 +193,7 @@
                 my_div = fh[field].size / pcount[ptype]
                 fname = fh[field].name[fh[field].name.find(ptype) + len(ptype) + 1:]
                 if my_div > 1:
-                    for i in range(my_div):
+                    for i in range(int(my_div)):
                         fields.append((ptype, "%s_%d" % (fname, i)))
                 else:
                     fields.append((ptype, fname))
@@ -205,7 +205,7 @@
                 my_div = fh[field].size / fh["/SUBFIND"].attrs["Number_of_groups"]
                 fname = fh[field].name[fh[field].name.find(ptype) + len(ptype) + 1:]
                 if my_div > 1:
-                    for i in range(my_div):
+                    for i in range(int(my_div)):
                         fields.append(("FOF", "%s_%d" % (fname, i)))
                 else:
                     fields.append(("FOF", fname))

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.