[yt-svn] commit/yt: MatthewTurk: Merged in brittonsmith/yt/yt-3.0 (pull request #866)

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/4ce853670d87/
Changeset:   4ce853670d87
Branch:      yt-3.0
User:        MatthewTurk
Date:        2014-05-05 14:56:04
Summary:     Merged in brittonsmith/yt/yt-3.0 (pull request #866)

Fixes to make zoomin_frames recipe work.
Affected #:  2 files

diff -r 6ad791b0d95a48528a8b02c2f0eec41a0d2fbde0 -r 4ce853670d87f1463676208c2340e6af1c5e7916 doc/source/cookbook/zoomin_frames.py
--- a/doc/source/cookbook/zoomin_frames.py
+++ b/doc/source/cookbook/zoomin_frames.py
@@ -22,6 +22,6 @@
 for i,v in enumerate(np.logspace(
             0, np.log10(pf.index.get_smallest_dx()*min_dx), n_frames)):
     # We set our width as necessary for this frame ...
-    p.set_width(v, '1')
+    p.set_width(v, 'unitary')
     # ... and we save!
     p.save(frame_template % (i))

diff -r 6ad791b0d95a48528a8b02c2f0eec41a0d2fbde0 -r 4ce853670d87f1463676208c2340e6af1c5e7916 yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -40,6 +40,8 @@
     mylog, iterable, ensure_list, \
     fix_axis, assert_valid_width_tuple
 from yt.units.unit_object import Unit
+from yt.units.unit_registry import \
+     UnitParseError
 from yt.utilities.png_writer import \
     write_png_to_string
 from yt.utilities.definitions import \
@@ -49,7 +51,8 @@
 from yt.utilities.exceptions import \
     YTUnitNotRecognized, \
     YTInvalidWidthError, \
-    YTCannotParseUnitDisplayName
+    YTCannotParseUnitDisplayName, \
+    YTUnitConversionError
 
 from yt.data_objects.time_series import \
     DatasetSeries

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.