fix

Author: NoureldinYosri

test/cython/test_with_unit.py

@@ -18,7 +18,7 @@
 import numpy as np
 import pytest
 
-from tunits.core import raw_WithUnit, raw_UnitArray, WithUnit
+from tunits.core import raw_WithUnit, raw_UnitArray, WithUnit, NotTUnitsLikeError
 
 from tunits import UnitMismatchError, ValueArray, Value
 from test.test_utils import frac, conv, val
@@ -85,7 +85,6 @@ def test_abs() -> None:
 
 def test_equality() -> None:
     equivalence_groups: list[list[Any]] = [
-        [""],
         ["other types"],
         [list],
         [None],
@@ -488,21 +487,11 @@ def test_get_item() -> None:
     v = val(2, conv(numer=3, denom=5, exp10=7), mps, kph)
 
     # Wrong kinds of index (unit array, slice).
-    with pytest.raises(TypeError):
+    with pytest.raises(UnitMismatchError):
         _ = u[mps]
-    with pytest.raises(TypeError):
+    with pytest.raises(NotTUnitsLikeError):
         _ = u[1:2]
 
-    # Safety against dimensionless unit ambiguity.
-    _ = u[u]
-    with pytest.raises(TypeError):
-        _ = u[1.0]
-    with pytest.raises(TypeError):
-        _ = u[1.0]
-    with pytest.raises(TypeError):
-        _ = u[1]
-    with pytest.raises(TypeError):
-        _ = u[2 * v / v]
     assert u[v / v] == 10
 
     # Wrong unit.

test/test_value.py

@@ -177,10 +177,7 @@ def test_division() -> None:
 def test_get_item() -> None:
     from tunits.units import ns, s
 
-    with pytest.raises(TypeError):
-        _ = (ns / s)[2 * s / ns]
-    with pytest.raises(TypeError):
-        _ = (ns / s)[Value(3, '')]
+    assert (ns / s)[Value(3, '')] == pytest.approx(1 / 3 * 1e-9)
     assert Value(1, '')[Value(1, '')] == 1
     assert Value(1, '')[ns / s] == 10**9
 

tunits/core/cython/with_unit.pyx

@@ -582,9 +582,12 @@ cdef class WithUnit:
         except NotTUnitsLikeError:
             return NotImplemented
         except TypeError:
-            unit_val = _try_interpret_as_with_unit(str(key), True)
+            try:
+                unit_val = _try_interpret_as_with_unit(str(key), True)
+            except:
+                raise NotTUnitsLikeError("Bad unit key: " + repr(key))
             if unit_val is None:
-                return NotImplemented
+                raise NotTUnitsLikeError("Bad unit key: " + repr(key))
             if self.base_units != unit_val.base_units:
                 raise UnitMismatchError("'%s' doesn't match '%s'." %
                     (self, key))