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

Bitbucket commits-noreply at bitbucket.org
Thu Nov 15 10:52:12 PST 2012


4 new commits in yt:


https://bitbucket.org/yt_analysis/yt/changeset/f6ac7d402559/
changeset:   f6ac7d402559
branch:      yt
user:        ngoldbaum
date:        2012-11-12 19:56:17
summary:     Fixing the way we find image filename suffixes.  Closes #439.
affected #:  2 files

diff -r 26ca29ffd1d14a695209102bfc422872480e4804 -r f6ac7d402559656798890e668ff3c9c559bbc313 yt/visualization/image_writer.py
--- a/yt/visualization/image_writer.py
+++ b/yt/visualization/image_writer.py
@@ -420,7 +420,7 @@
     else:
         dpi = None
 
-    suffix = os.path.splitext(filename)[1]
+    suffix = os.path.splitext(filename)[-1]
 
     if suffix == '':
         suffix = '.png'


diff -r 26ca29ffd1d14a695209102bfc422872480e4804 -r f6ac7d402559656798890e668ff3c9c559bbc313 yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -892,7 +892,7 @@
         if mpl_kwargs is None: mpl_kwargs = {}
         if name == None:
             name = str(self.pf)
-        suffix = os.path.splitext(name)[1]
+        suffix = os.path.splitext(name)[-1]
         if suffix != '':
             for k, v in self.plots.iteritems():
                 names.append(v.save(name,mpl_kwargs))
@@ -1453,7 +1453,7 @@
             self.cax = self.figure.add_axes(caxrect)
             
     def save(self, name, mpl_kwargs, canvas = None):
-        suffix = os.path.splitext(name)[1]
+        suffix = os.path.splitext(name)[-1]
         
         if suffix == '':
             suffix = '.png'



https://bitbucket.org/yt_analysis/yt/changeset/0711a5d01017/
changeset:   0711a5d01017
branch:      yt
user:        ngoldbaum
date:        2012-11-15 02:12:55
summary:     Merging.
affected #:  2 files

diff -r 2dad179d5aecd55cc7856b910247a5855be4fa7e -r 0711a5d010170da6228f8fb6fe6cc46ce38f4ade yt/visualization/image_writer.py
--- a/yt/visualization/image_writer.py
+++ b/yt/visualization/image_writer.py
@@ -420,7 +420,7 @@
     else:
         dpi = None
 
-    suffix = os.path.splitext(filename)[1]
+    suffix = os.path.splitext(filename)[-1]
 
     if suffix == '':
         suffix = '.png'


diff -r 2dad179d5aecd55cc7856b910247a5855be4fa7e -r 0711a5d010170da6228f8fb6fe6cc46ce38f4ade yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -921,7 +921,7 @@
         if mpl_kwargs is None: mpl_kwargs = {}
         if name is None:
             name = str(self.pf)
-        suffix = os.path.splitext(name)[1]
+        suffix = os.path.splitext(name)[-1]
         if suffix != '':
             for k, v in self.plots.iteritems():
                 names.append(v.save(name,mpl_kwargs))
@@ -1496,7 +1496,7 @@
             self.cax = self.figure.add_axes(caxrect)
             
     def save(self, name, mpl_kwargs, canvas = None):
-        suffix = os.path.splitext(name)[1]
+        suffix = os.path.splitext(name)[-1]
         
         if suffix == '':
             suffix = '.png'



https://bitbucket.org/yt_analysis/yt/changeset/9a13943aae04/
changeset:   9a13943aae04
branch:      yt
user:        ngoldbaum
date:        2012-11-15 02:19:48
summary:     Adding a new get_suffix() helper to funcs.py which determines if a file has an image suffix.
affected #:  3 files

diff -r 0711a5d010170da6228f8fb6fe6cc46ce38f4ade -r 9a13943aae0445b03d898edeb16397c5a9f27827 yt/funcs.py
--- a/yt/funcs.py
+++ b/yt/funcs.py
@@ -567,3 +567,7 @@
         
 def fix_axis(axis):
     return inv_axis_names.get(axis, axis)
+
+def get_image_suffix(name):
+    suffix = os.path.splitext(name)[1]
+    return suffix if suffix in ['png', 'eps', 'ps', 'pdf'] else ''


diff -r 0711a5d010170da6228f8fb6fe6cc46ce38f4ade -r 9a13943aae0445b03d898edeb16397c5a9f27827 yt/visualization/image_writer.py
--- a/yt/visualization/image_writer.py
+++ b/yt/visualization/image_writer.py
@@ -420,7 +420,7 @@
     else:
         dpi = None
 
-    suffix = os.path.splitext(filename)[-1]
+    suffix = get_image_suffix(filename)
 
     if suffix == '':
         suffix = '.png'


diff -r 0711a5d010170da6228f8fb6fe6cc46ce38f4ade -r 9a13943aae0445b03d898edeb16397c5a9f27827 yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -921,7 +921,7 @@
         if mpl_kwargs is None: mpl_kwargs = {}
         if name is None:
             name = str(self.pf)
-        suffix = os.path.splitext(name)[-1]
+        suffix = get_image_suffix(name)
         if suffix != '':
             for k, v in self.plots.iteritems():
                 names.append(v.save(name,mpl_kwargs))
@@ -1496,7 +1496,7 @@
             self.cax = self.figure.add_axes(caxrect)
             
     def save(self, name, mpl_kwargs, canvas = None):
-        suffix = os.path.splitext(name)[-1]
+        suffix = get_image_suffix(name)
         
         if suffix == '':
             suffix = '.png'



https://bitbucket.org/yt_analysis/yt/changeset/e0fea3dd9635/
changeset:   e0fea3dd9635
branch:      yt
user:        MatthewTurk
date:        2012-11-15 19:52:10
summary:     Merged in ngoldbaum/yt (pull request #334)
affected #:  3 files

diff -r 8cb9af8d00eea1225d16825db5e931cfde23baa4 -r e0fea3dd96350177c6bb49727f252f2303e0fdad yt/funcs.py
--- a/yt/funcs.py
+++ b/yt/funcs.py
@@ -567,3 +567,7 @@
         
 def fix_axis(axis):
     return inv_axis_names.get(axis, axis)
+
+def get_image_suffix(name):
+    suffix = os.path.splitext(name)[1]
+    return suffix if suffix in ['png', 'eps', 'ps', 'pdf'] else ''


diff -r 8cb9af8d00eea1225d16825db5e931cfde23baa4 -r e0fea3dd96350177c6bb49727f252f2303e0fdad yt/visualization/image_writer.py
--- a/yt/visualization/image_writer.py
+++ b/yt/visualization/image_writer.py
@@ -420,7 +420,7 @@
     else:
         dpi = None
 
-    suffix = os.path.splitext(filename)[1]
+    suffix = get_image_suffix(filename)
 
     if suffix == '':
         suffix = '.png'


diff -r 8cb9af8d00eea1225d16825db5e931cfde23baa4 -r e0fea3dd96350177c6bb49727f252f2303e0fdad yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -919,7 +919,7 @@
         if mpl_kwargs is None: mpl_kwargs = {}
         if name is None:
             name = str(self.pf)
-        suffix = os.path.splitext(name)[1]
+        suffix = get_image_suffix(name)
         if suffix != '':
             for k, v in self.plots.iteritems():
                 names.append(v.save(name,mpl_kwargs))
@@ -1494,7 +1494,7 @@
             self.cax = self.figure.add_axes(caxrect)
             
     def save(self, name, mpl_kwargs, canvas = None):
-        suffix = os.path.splitext(name)[1]
+        suffix = get_image_suffix(name)
         
         if suffix == '':
             suffix = '.png'

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