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

[Bitbucket]

6 new commits in yt:


https://bitbucket.org/yt_analysis/yt/changeset/f83eb46bb5d8/
changeset:   f83eb46bb5d8
branch:      yt
user:        ngoldbaum
date:        2012-12-11 02:43:15
summary:     Checking for directories full of nonexistent data.
affected #:  1 file

diff -r 6c8b29681fef1e54d9486a65567b05ed1d938745 -r f83eb46bb5d89f88587a2566f23cf28f6f25a0e5 yt/data_objects/time_series.py
--- a/yt/data_objects/time_series.py
+++ b/yt/data_objects/time_series.py
@@ -260,6 +260,8 @@
         """
         if isinstance(filenames, types.StringTypes):
             filenames = glob.glob(filenames)
+            if len(filenames) == 0:
+                raise YTOutputNotIdentified(filenames, {})
             filenames.sort()
         obj = cls(filenames[:], parallel = parallel, **kwargs)
         return obj



https://bitbucket.org/yt_analysis/yt/changeset/fd71219bbc42/
changeset:   fd71219bbc42
branch:      yt
user:        ngoldbaum
date:        2012-12-11 02:45:13
summary:     Reporting a more useful error message if one tries to directly create a nonexistent TimeSeries
affected #:  1 file

diff -r f83eb46bb5d89f88587a2566f23cf28f6f25a0e5 -r fd71219bbc42fd2643f61fa2cf667273eb502ddf yt/data_objects/time_series.py
--- a/yt/data_objects/time_series.py
+++ b/yt/data_objects/time_series.py
@@ -259,11 +259,11 @@
 
         """
         if isinstance(filenames, types.StringTypes):
-            filenames = glob.glob(filenames)
-            if len(filenames) == 0:
+            pflist = glob.glob(filenames)
+            if len(pflist) == 0:
                 raise YTOutputNotIdentified(filenames, {})
-            filenames.sort()
-        obj = cls(filenames[:], parallel = parallel, **kwargs)
+            pflist.sort()
+        obj = cls(pflist[:], parallel = parallel, **kwargs)
         return obj
 
     @classmethod



https://bitbucket.org/yt_analysis/yt/changeset/3954d9befc7b/
changeset:   3954d9befc7b
branch:      yt
user:        ngoldbaum
date:        2012-12-11 02:46:33
summary:     Small change for readability.
affected #:  1 file

diff -r fd71219bbc42fd2643f61fa2cf667273eb502ddf -r 3954d9befc7b0bf93d0439181a37df2b12b81a4a yt/data_objects/time_series.py
--- a/yt/data_objects/time_series.py
+++ b/yt/data_objects/time_series.py
@@ -259,11 +259,11 @@
 
         """
         if isinstance(filenames, types.StringTypes):
-            pflist = glob.glob(filenames)
-            if len(pflist) == 0:
+            pf_list = glob.glob(filenames)
+            if len(pf_list) == 0:
                 raise YTOutputNotIdentified(filenames, {})
-            pflist.sort()
-        obj = cls(pflist[:], parallel = parallel, **kwargs)
+            pf_list.sort()
+        obj = cls(pf_list[:], parallel = parallel, **kwargs)
         return obj
 
     @classmethod



https://bitbucket.org/yt_analysis/yt/changeset/67cc52ef33df/
changeset:   67cc52ef33df
branch:      yt
user:        ngoldbaum
date:        2012-12-11 19:33:17
summary:     Fixing some issues pointed out by Matt.
affected #:  1 file

diff -r 3954d9befc7b0bf93d0439181a37df2b12b81a4a -r 67cc52ef33df68adbb67e3db032c9ef7a832f522 yt/data_objects/time_series.py
--- a/yt/data_objects/time_series.py
+++ b/yt/data_objects/time_series.py
@@ -258,12 +258,14 @@
         ...     SlicePlot(pf, "x", "Density").save()
 
         """
+        
         if isinstance(filenames, types.StringTypes):
-            pf_list = glob.glob(filenames)
-            if len(pf_list) == 0:
-                raise YTOutputNotIdentified(filenames, {})
-            pf_list.sort()
-        obj = cls(pf_list[:], parallel = parallel, **kwargs)
+            glob_string = filenames
+            filenames = glob.glob(glob_string)
+            filenames.sort()
+        if len(filenames) == 0:
+            raise YTOutputNotIdentified(glob_string, {})
+        obj = cls(filenames[:], parallel = parallel, **kwargs)
         return obj
 
     @classmethod



https://bitbucket.org/yt_analysis/yt/changeset/9cf22c654aa6/
changeset:   9cf22c654aa6
branch:      yt
user:        ngoldbaum
date:        2012-12-11 19:42:31
summary:     Still need to make sure this works for every execution path.
affected #:  1 file

diff -r 67cc52ef33df68adbb67e3db032c9ef7a832f522 -r 9cf22c654aa695024341fad30afeb68fa06c6e65 yt/data_objects/time_series.py
--- a/yt/data_objects/time_series.py
+++ b/yt/data_objects/time_series.py
@@ -260,11 +260,10 @@
         """
         
         if isinstance(filenames, types.StringTypes):
-            glob_string = filenames
-            filenames = glob.glob(glob_string)
+            filenames = glob.glob(filenames)
             filenames.sort()
         if len(filenames) == 0:
-            raise YTOutputNotIdentified(glob_string, {})
+            raise YTOutputNotIdentified(filenames, {})
         obj = cls(filenames[:], parallel = parallel, **kwargs)
         return obj
 



https://bitbucket.org/yt_analysis/yt/changeset/04e4a6a7d108/
changeset:   04e4a6a7d108
branch:      yt
user:        MatthewTurk
date:        2012-12-11 19:43:52
summary:     Merged in ngoldbaum/yt (pull request #367)
affected #:  1 file

diff -r 93320835f626e08a4a6378656ad376e225794a04 -r 04e4a6a7d10836f01864993c2507ffc6f89a00aa yt/data_objects/time_series.py
--- a/yt/data_objects/time_series.py
+++ b/yt/data_objects/time_series.py
@@ -258,9 +258,12 @@
         ...     SlicePlot(pf, "x", "Density").save()
 
         """
+        
         if isinstance(filenames, types.StringTypes):
             filenames = glob.glob(filenames)
             filenames.sort()
+        if len(filenames) == 0:
+            raise YTOutputNotIdentified(filenames, {})
         obj = cls(filenames[:], parallel = parallel, **kwargs)
         return obj

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.