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

[Bitbucket]

4 new commits in yt:


https://bitbucket.org/yt_analysis/yt/changeset/5b173fb7d9d9/
changeset:   5b173fb7d9d9
branch:      yt
user:        ngoldbaum
date:        2012-06-20 00:07:46
summary:     A user-defined function may not return an iterable.  This checks and makes the
returned value an iterable.
affected #:  1 file

diff -r a437280f3cefff3e7a41198438a5dfb7922f74e5 -r 5b173fb7d9d95e7ebcdd50207740c20a21865bfa yt/data_objects/derived_quantities.py
--- a/yt/data_objects/derived_quantities.py
+++ b/yt/data_objects/derived_quantities.py
@@ -97,6 +97,10 @@
         self.retvals = [ [] for i in range(self.n_ret)]
         for gi,g in enumerate(self._get_grids()):
             rv = self.func(GridChildMaskWrapper(g, self._data_source), *args, **kwargs)
+            try:
+                rv[i]
+            except IndexError:
+                rv = [rv]
             for i in range(self.n_ret): self.retvals[i].append(rv[i])
             g.clear_data()
         self.retvals = [na.array(self.retvals[i]) for i in range(self.n_ret)]



https://bitbucket.org/yt_analysis/yt/changeset/b9ace3a7a2ed/
changeset:   b9ace3a7a2ed
branch:      yt
user:        ngoldbaum
date:        2012-06-20 00:16:33
summary:     Merging
affected #:  1 file

diff -r befec010e528b9a059f264356cf1a163f7aac638 -r b9ace3a7a2ed3651784958c7cfee23cd22eddd18 yt/data_objects/derived_quantities.py
--- a/yt/data_objects/derived_quantities.py
+++ b/yt/data_objects/derived_quantities.py
@@ -97,6 +97,10 @@
         self.retvals = [ [] for i in range(self.n_ret)]
         for gi,g in enumerate(self._get_grids()):
             rv = self.func(GridChildMaskWrapper(g, self._data_source), *args, **kwargs)
+            try:
+                rv[i]
+            except IndexError:
+                rv = [rv]
             for i in range(self.n_ret): self.retvals[i].append(rv[i])
             g.clear_data()
         self.retvals = [na.array(self.retvals[i]) for i in range(self.n_ret)]



https://bitbucket.org/yt_analysis/yt/changeset/b3d254c2f0c3/
changeset:   b3d254c2f0c3
branch:      yt
user:        ngoldbaum
date:        2012-06-20 00:20:23
summary:     i isn't defined yet, oops!
affected #:  1 file

diff -r b9ace3a7a2ed3651784958c7cfee23cd22eddd18 -r b3d254c2f0c3b413e2140e8d39f41e9aff0e70d7 yt/data_objects/derived_quantities.py
--- a/yt/data_objects/derived_quantities.py
+++ b/yt/data_objects/derived_quantities.py
@@ -98,7 +98,7 @@
         for gi,g in enumerate(self._get_grids()):
             rv = self.func(GridChildMaskWrapper(g, self._data_source), *args, **kwargs)
             try:
-                rv[i]
+                rv[0]
             except IndexError:
                 rv = [rv]
             for i in range(self.n_ret): self.retvals[i].append(rv[i])



https://bitbucket.org/yt_analysis/yt/changeset/296a030c9020/
changeset:   296a030c9020
branch:      yt
user:        ngoldbaum
date:        2012-06-20 02:27:12
summary:     Doing this a little bit more cleanly.
affected #:  1 file

diff -r b3d254c2f0c3b413e2140e8d39f41e9aff0e70d7 -r 296a030c902028992401ea179d5f01bf6e8e9cd0 yt/data_objects/derived_quantities.py
--- a/yt/data_objects/derived_quantities.py
+++ b/yt/data_objects/derived_quantities.py
@@ -97,10 +97,7 @@
         self.retvals = [ [] for i in range(self.n_ret)]
         for gi,g in enumerate(self._get_grids()):
             rv = self.func(GridChildMaskWrapper(g, self._data_source), *args, **kwargs)
-            try:
-                rv[0]
-            except IndexError:
-                rv = [rv]
+            if not iterable(rv): rv = (rv,)
             for i in range(self.n_ret): self.retvals[i].append(rv[i])
             g.clear_data()
         self.retvals = [na.array(self.retvals[i]) for i in range(self.n_ret)]

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.