-

cool-RR · cool-RR · commit 266ea6a08b18 · 2014-09-24T03:02:46.000+03:00
diff --git a/source_py2/python_toolbox/sequence_tools/cute_range.py b/source_py2/python_toolbox/sequence_tools/cute_range.py
@@ -197,12 +197,13 @@ def __getitem__(self, i, allow_out_of_range=False):
             canonical_slice = sequence_tools.CanonicalSlice(
                 i, iterable_or_length=self
             )
-            if not ((0 <= canonical_slice.start < self.length) and
+            if not ((0 <= canonical_slice.start <= self.length) and
                     ((0 <= canonical_slice.stop <= self.length) or
                      (canonical_slice.stop == self.length == infinity))):
                 raise TypeError
             return CuteRange(
-                self[canonical_slice.start],
+                self.__getitem__(canonical_slice.start,
+                                 allow_out_of_range=True),
                 self.__getitem__(canonical_slice.stop,
                                  allow_out_of_range=True),
                 self.step * canonical_slice.step
diff --git a/source_py2/test_python_toolbox/test_combi/test_comb_space.py b/source_py2/test_python_toolbox/test_combi/test_comb_space.py
@@ -2,6 +2,7 @@
 # This program is distributed under the MIT license.
 
 from python_toolbox import cute_testing
+from python_toolbox import sequence_tools
 
 from python_toolbox.combi import *
 
@@ -41,7 +42,8 @@ def test():
         comb_space.get_degreed(3)
     assert comb_space.unfixed == comb_space
     assert not comb_space.fixed_indices
-    assert comb_space.free_indices == comb_space.free_keys == range(2)
+    assert comb_space.free_indices == comb_space.free_keys == \
+                        sequence_tools.CuteRange(2, _avoid_built_in_range=True)
     assert comb_space.free_values == 'dumber'
     
     comb = comb_space[7]
diff --git a/source_py3/python_toolbox/sequence_tools/cute_range.py b/source_py3/python_toolbox/sequence_tools/cute_range.py
@@ -191,12 +191,13 @@ def __getitem__(self, i, allow_out_of_range=False):
             canonical_slice = sequence_tools.CanonicalSlice(
                 i, iterable_or_length=self
             )
-            if not ((0 <= canonical_slice.start < self.length) and
+            if not ((0 <= canonical_slice.start <= self.length) and
                     ((0 <= canonical_slice.stop <= self.length) or
                      (canonical_slice.stop == self.length == infinity))):
                 raise TypeError
             return CuteRange(
-                self[canonical_slice.start],
+                self.__getitem__(canonical_slice.start,
+                                 allow_out_of_range=True),
                 self.__getitem__(canonical_slice.stop,
                                  allow_out_of_range=True),
                 self.step * canonical_slice.step
