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

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/5f2c6b6da9cf/
Changeset:   5f2c6b6da9cf
Branch:      yt-3.0
User:        MatthewTurk
Date:        2014-05-17 19:32:03
Summary:     Merged in MatthewTurk/yt/yt-3.0 (pull request #899)

Change how we check for on-demand imports
Affected #:  1 file

diff -r 88056872e1bd42b4a657201277526e5e0d67a8ac -r 5f2c6b6da9cf36ca09548a2c5c6286a77032d2d9 yt/units/yt_array.py
--- a/yt/units/yt_array.py
+++ b/yt/units/yt_array.py
@@ -252,7 +252,7 @@
                     "Perhaps you meant to do something like this instead: \n"
                     "ds.arr(%s, \"%s\")" % (input_array, input_units)
                     )
-        if _astropy.units is not None:
+        if _astropy._units is not None:
             if isinstance(input_array, _astropy.units.quantity.Quantity):
                 return cls.from_astropy(input_array)
         if isinstance(input_array, YTArray):

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.