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

[commits-noreply at bitbucket.org]

3 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/bd9049529321/
Changeset:   bd9049529321
Branch:      yt
User:        ngoldbaum
Date:        2016-05-18 23:24:47+00:00
Summary:     [bugfix] fix add_field handling when passed a tuple
Affected #:  1 file

diff -r de4aaa4344b2ffd78d9e4411074b9b398f5e6ad4 -r bd90495293210d456a6fce7989c834945793a92e yt/fields/field_info_container.py
--- a/yt/fields/field_info_container.py
+++ b/yt/fields/field_info_container.py
@@ -253,15 +253,16 @@
                 self[name] = DerivedField(name, f, **kwargs)
                 return f
             return create_function
-        ptype = kwargs.get("particle_type", False)
-        if ptype:
-            ftype = 'all'
-        else:
-            ftype = self.ds.default_fluid_type
-        if not isinstance(name, tuple) and (ftype, name) not in self:
-            tuple_name = (ftype, name)
-            self[tuple_name] = DerivedField(tuple_name, function, **kwargs)
-            self.alias(name, tuple_name)
+        if not isinstance(name, tuple):
+            ptype = kwargs.get("particle_type", False)
+            if ptype:
+                ftype = 'all'
+            else:
+                ftype = self.ds.default_fluid_type
+            if (ftype, name) not in self:
+                tuple_name = (ftype, name)
+                self[tuple_name] = DerivedField(tuple_name, function, **kwargs)
+                self.alias(name, tuple_name)
         else:
             self[name] = DerivedField(name, function, **kwargs)
 


https://bitbucket.org/yt_analysis/yt/commits/2a91813d90c4/
Changeset:   2a91813d90c4
Branch:      yt
User:        ngoldbaum
Date:        2016-05-19 02:32:33+00:00
Summary:     fix corner case, rearrange, simplify logic
Affected #:  1 file

diff -r bd90495293210d456a6fce7989c834945793a92e -r 2a91813d90c4890315dfb7c435e4a228451dfd75 yt/fields/field_info_container.py
--- a/yt/fields/field_info_container.py
+++ b/yt/fields/field_info_container.py
@@ -253,16 +253,20 @@
                 self[name] = DerivedField(name, f, **kwargs)
                 return f
             return create_function
-        if not isinstance(name, tuple):
-            ptype = kwargs.get("particle_type", False)
-            if ptype:
-                ftype = 'all'
-            else:
-                ftype = self.ds.default_fluid_type
-            if (ftype, name) not in self:
-                tuple_name = (ftype, name)
-                self[tuple_name] = DerivedField(tuple_name, function, **kwargs)
-                self.alias(name, tuple_name)
+
+        if isinstance(name, tuple):
+            self[name] = DerivedField(name, function, **kwargs)
+            return
+
+        if kwargs.get("particle_type", False):
+            ftype = 'all'
+        else:
+            ftype = self.ds.default_fluid_type
+
+        if (ftype, name) not in self:
+            tuple_name = (ftype, name)
+            self[tuple_name] = DerivedField(tuple_name, function, **kwargs)
+            self.alias(name, tuple_name)
         else:
             self[name] = DerivedField(name, function, **kwargs)
 


https://bitbucket.org/yt_analysis/yt/commits/4898059be9f9/
Changeset:   4898059be9f9
Branch:      yt
User:        jzuhone
Date:        2016-05-24 17:05:41+00:00
Summary:     Merged in ngoldbaum/yt (pull request #2184)

[bugfix] fix add_field handling when passed a tuple
Affected #:  1 file

diff -r 19aead8b2225bdd19398c18c07470d084f8fbca0 -r 4898059be9f9314615b7a7df090845dda5bdefe5 yt/fields/field_info_container.py
--- a/yt/fields/field_info_container.py
+++ b/yt/fields/field_info_container.py
@@ -253,12 +253,17 @@
                 self[name] = DerivedField(name, f, **kwargs)
                 return f
             return create_function
-        ptype = kwargs.get("particle_type", False)
-        if ptype:
+
+        if isinstance(name, tuple):
+            self[name] = DerivedField(name, function, **kwargs)
+            return
+
+        if kwargs.get("particle_type", False):
             ftype = 'all'
         else:
             ftype = self.ds.default_fluid_type
-        if not isinstance(name, tuple) and (ftype, name) not in self:
+
+        if (ftype, name) not in self:
             tuple_name = (ftype, name)
             self[tuple_name] = DerivedField(tuple_name, function, **kwargs)
             self.alias(name, tuple_name)

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.