[yt-svn] commit/yt: 4 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Mon Oct 17 14:17:43 PDT 2016
4 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/c7236b801b28/
Changeset: c7236b801b28
Branch: yt
User: ngoldbaum
Date: 2016-10-10 18:48:13+00:00
Summary: Ensure the argmax axis is a list
Affected #: 1 file
diff -r 314a02c1f9342ada3ac7f6ae823e264f798a095f -r c7236b801b28af7f5738b13e4824f4b69d5f6e56 yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -661,6 +661,8 @@
if axis is None:
mv, pos0, pos1, pos2 = self.quantities.max_location(field)
return pos0, pos1, pos2
+ if isinstance(axis, basestring):
+ axis = [axis]
rv = self.quantities.sample_at_max_field_values(field, axis)
if len(rv) == 2:
return rv[1]
https://bitbucket.org/yt_analysis/yt/commits/cf3c0e4d6c66/
Changeset: cf3c0e4d6c66
Branch: yt
User: ngoldbaum
Date: 2016-10-11 02:09:08+00:00
Summary: fix python3 compatibility
Affected #: 1 file
diff -r c7236b801b28af7f5738b13e4824f4b69d5f6e56 -r cf3c0e4d6c66df28513e9ab6abc048d2eb347c73 yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -661,7 +661,7 @@
if axis is None:
mv, pos0, pos1, pos2 = self.quantities.max_location(field)
return pos0, pos1, pos2
- if isinstance(axis, basestring):
+ if isinstance(axis, six.string_types):
axis = [axis]
rv = self.quantities.sample_at_max_field_values(field, axis)
if len(rv) == 2:
https://bitbucket.org/yt_analysis/yt/commits/6001afd4c1e3/
Changeset: 6001afd4c1e3
Branch: yt
User: ngoldbaum
Date: 2016-10-11 16:46:03+00:00
Summary: fix nameerror
Affected #: 1 file
diff -r cf3c0e4d6c66df28513e9ab6abc048d2eb347c73 -r 6001afd4c1e3febb8b35968e2d95208b3b08cb0c yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -661,7 +661,7 @@
if axis is None:
mv, pos0, pos1, pos2 = self.quantities.max_location(field)
return pos0, pos1, pos2
- if isinstance(axis, six.string_types):
+ if isinstance(axis, string_types):
axis = [axis]
rv = self.quantities.sample_at_max_field_values(field, axis)
if len(rv) == 2:
https://bitbucket.org/yt_analysis/yt/commits/c9222c0a7004/
Changeset: c9222c0a7004
Branch: yt
User: ngoldbaum
Date: 2016-10-17 21:17:15+00:00
Summary: Merged in ngoldbaum/yt (pull request #2414)
Ensure the argmax axis is a list
Affected #: 1 file
diff -r f7ef0effe08bb79cd7a1d3ef4126975957d870b9 -r c9222c0a700487f6e088bcaa1b63027b0c83bfa4 yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -661,6 +661,8 @@
if axis is None:
mv, pos0, pos1, pos2 = self.quantities.max_location(field)
return pos0, pos1, pos2
+ if isinstance(axis, string_types):
+ axis = [axis]
rv = self.quantities.sample_at_max_field_values(field, axis)
if len(rv) == 2:
return rv[1]
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.
More information about the yt-svn
mailing list