-

cool-RR · cool-RR · commit 565f3709bace · 2014-09-18T01:52:05.000+03:00
diff --git a/source_py3/python_toolbox/misc_tools/misc_tools.py b/source_py3/python_toolbox/misc_tools/misc_tools.py
@@ -369,4 +369,7 @@ def __len__(self):
             raise OverflowError("Due to CPython limitation, you'll have to "
                                 "use `.length` rather than `len`")
         
+    def __bool__(self):
+        from python_toolbox import sequence_tools
+        return bool(sequence_tools.get_length(self))
         
diff --git a/source_py3/python_toolbox/sequence_tools/cute_range.py b/source_py3/python_toolbox/sequence_tools/cute_range.py
@@ -139,7 +139,7 @@ def length(self):
         The length of the `CuteRange`.
         
         We're using a property `.length` rather than the built-in `__len__`
-        because `__len__` can't handle infinite values.
+        because `__len__` can't handle infinite values or floats.
         '''
         from python_toolbox import math_tools
         
@@ -200,23 +200,27 @@ def __getitem__(self, i):
             raise TypeError
         
     def __len__(self):
-        # Sadly Python doesn't allow infinity here.
-        return self.length if (self.length not in infinities) else 0
+        # Sadly Python doesn't allow infinity or floats here.
+        return self.length if isinstance(self.length, numbers.Integral) else 0
         
     def __contains__(self, i):
         try: self.index(i)
         except ValueError: return False
         else: return True
         
     def index(self, i):
+        from python_toolbox import math_tools
         if not isinstance(i, numbers.Number):
             raise ValueError
         else:
             distance = i - self.start
+            if distance == 0 and self:
+                return True
             if math_tools.get_sign(distance) != math_tools.get_sign(self.step):
                 raise ValueError
-            index, remainder = divmod(distance, self.step)
-            if remainder == 0:
+            index, remainder = math_tools.cute_divmod(distance, self.step)
+            if remainder == 0 and (0 <= index < self.length or
+                                             index == self.length == infinity):
                 return index
             else:
                 raise ValueError
diff --git a/source_py3/test_python_toolbox/test_sequence_tools/test_cute_range.py b/source_py3/test_python_toolbox/test_sequence_tools/test_cute_range.py
@@ -59,8 +59,13 @@ def test_illegal():
 def test_float():
     cr = CuteRange(10, 20, 1.5)
     assert list(cr) == [10, 11.5, 13, 14.5, 16, 17.5, 19]
-    assert len(cr) == len(list(cr)) == 7
-    assert list(map(range(7), cr.__getitem__)) == list(cr)
+    for item in list(cr):
+        assert item in cr
+    assert 20 not in cr
+    assert 20.5 not in cr
+    assert 8.5 not in cr
+    assert cr.length == len(list(cr)) == 7
+    assert list(map(cr.__getitem__, range(7))) == list(cr)
     
     float_range_arguments_tuples = (
         (10, 20, 1.5), (20, 10.5, -0.33), (10.3, infinity, 2.5),
