[yt-svn] commit/yt: ChrisMalone: Merged in brittonsmith/yt (pull request #1151)

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/b82f8fd3ae15/
Changeset:   b82f8fd3ae15
Branch:      yt
User:        ChrisMalone
Date:        2014-08-19 16:31:32
Summary:     Merged in brittonsmith/yt (pull request #1151)

Fixing argument list for YTSelectionContainer3D and allowing all_data to accept additional kwargs.
Affected #:  2 files

diff -r 6785a0afebb0d7a03491d38c1a4b4f72c817cf9d -r b82f8fd3ae15d64ac3625b67e17f3779ebb59c3a yt/data_objects/selection_data_containers.py
--- a/yt/data_objects/selection_data_containers.py
+++ b/yt/data_objects/selection_data_containers.py
@@ -576,7 +576,7 @@
     _con_args = ('center', 'left_edge', 'right_edge')
     def __init__(self, center, left_edge, right_edge, fields = None,
                  ds = None, **kwargs):
-        YTSelectionContainer3D.__init__(self, center, fields, ds, **kwargs)
+        YTSelectionContainer3D.__init__(self, center, ds, **kwargs)
         if not isinstance(left_edge, YTArray):
             self.left_edge = self.ds.arr(left_edge, 'code_length')
         else:

diff -r 6785a0afebb0d7a03491d38c1a4b4f72c817cf9d -r b82f8fd3ae15d64ac3625b67e17f3779ebb59c3a yt/data_objects/static_output.py
--- a/yt/data_objects/static_output.py
+++ b/yt/data_objects/static_output.py
@@ -572,7 +572,7 @@
         return out
 
     # Now all the object related stuff
-    def all_data(self, find_max=False):
+    def all_data(self, find_max=False, **kwargs):
         """
         all_data is a wrapper to the Region object for creating a region
         which covers the entire simulation domain.
@@ -580,7 +580,7 @@
         if find_max: c = self.find_max("density")[1]
         else: c = (self.domain_right_edge + self.domain_left_edge)/2.0
         return self.region(c,
-            self.domain_left_edge, self.domain_right_edge)
+            self.domain_left_edge, self.domain_right_edge, **kwargs)
 
     def box(self, left_edge, right_edge, **kwargs):
         """

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.