[yt-svn] commit/yt: jzuhone: Merged in ngoldbaum/yt (pull request #1685)

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/7c2d53feae18/
Changeset:   7c2d53feae18
Branch:      yt
User:        jzuhone
Date:        2015-08-11 15:18:11+00:00
Summary:     Merged in ngoldbaum/yt (pull request #1685)

[BUGFIX] Fix NameError bug in comparing temperature units with offsets
Affected #:  2 files

diff -r 4ce919afe7519cdbe3748e036f851d0fa5d9d161 -r 7c2d53feae18014f798008c038aeea9101cf1570 yt/units/tests/test_units.py
--- a/yt/units/tests/test_units.py
+++ b/yt/units/tests/test_units.py
@@ -21,6 +21,7 @@
     assert_approx_equal, assert_array_almost_equal_nulp, \
     assert_allclose, assert_raises
 from nose.tools import assert_true
+import operator
 from sympy import Symbol
 from yt.testing import fake_random_ds
 
@@ -30,7 +31,7 @@
 # functions
 from yt.units.unit_object import get_conversion_factor
 # classes
-from yt.units.unit_object import Unit, UnitParseError
+from yt.units.unit_object import Unit, UnitParseError, InvalidUnitOperation
 # objects
 from yt.units.unit_lookup_table import \
     default_unit_symbol_lut, unit_prefixes, prefixable_units
@@ -441,3 +442,10 @@
     yield assert_true, u4.is_code_unit
     yield assert_true, not u5.is_code_unit
     yield assert_true, not u6.is_code_unit
+
+def test_temperature_offsets():
+    u1 = Unit('degC')
+    u2 = Unit('degF')
+
+    assert_raises(InvalidUnitOperation, operator.mul, u1, u2)
+    assert_raises(InvalidUnitOperation, operator.div, u1, u2)

diff -r 4ce919afe7519cdbe3748e036f851d0fa5d9d161 -r 7c2d53feae18014f798008c038aeea9101cf1570 yt/units/unit_object.py
--- a/yt/units/unit_object.py
+++ b/yt/units/unit_object.py
@@ -290,9 +290,9 @@
 
         base_offset = 0.0
         if self.base_offset or u.base_offset:
-            if u.dimensions is dims.temperature and self.is_dimensionless:
+            if u.dimensions is temperature and self.is_dimensionless:
                 base_offset = u.base_offset
-            elif self.dimensions is dims.temperature and u.is_dimensionless:
+            elif self.dimensions is temperature and u.is_dimensionless:
                 base_offset = self.base_offset
             else:
                 raise InvalidUnitOperation("Quantities with units of Farhenheit "

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.