Merge pull request #385 from jparise/newrange-index

newrange: handle non-numbers passed to index()

Author: jmadler

src/future/types/newrange.py

@@ -90,7 +90,10 @@ def __len__(self):
     def index(self, value):
         """Return the 0-based position of integer `value` in
         the sequence this range represents."""
-        diff = value - self._start
+        try:
+            diff = value - self._start
+        except TypeError:
+            raise ValueError('%r is not in range' % value)
         quotient, remainder = divmod(diff, self._step)
         if remainder == 0 and 0 <= quotient < self._len:
             return abs(quotient)

tests/test_future/test_range.py

@@ -26,6 +26,12 @@ def test_equality_range(self):
         self.assertEqual(range(0), range(1, 1))
         self.assertEqual(range(0, 10, 3), range(0, 11, 3))
 
+    def test_contains(self):
+        self.assertIn(1, range(2))
+        self.assertNotIn(10, range(2))
+        self.assertNotIn(None, range(2))
+        self.assertNotIn("", range(2))
+
     # Use strict equality of attributes when slicing to catch subtle differences
     def assertRangesEqual(self, r1, r2):
         by_attrs = attrgetter('start', 'stop', 'step')