-

cool-RR · cool-RR · commit dbdc51ff060b · 2014-09-24T02:33:50.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
@@ -175,13 +175,15 @@ def _repr(self):
         
         
     
-    def __getitem__(self, i):
+    def __getitem__(self, i, allow_out_of_range=False):
         from python_toolbox import sequence_tools
         if isinstance(i, numbers.Integral):
-            if 0 <= i < self.length:
+            if i < 0:
+                if i < (-self.length) and not allow_out_of_range:
+                    raise IndexError
+                i += self.length
+            if 0 <= i < self.length or allow_out_of_range:
                 return self.start + (self.step * i)
-            elif (-self.length) <= i < 0:
-                return self.start + (self.step * (i + self.length))
             else:
                 raise IndexError
         elif i == infinity:
@@ -196,12 +198,13 @@ def __getitem__(self, i):
                 i, iterable_or_length=self
             )
             if not ((0 <= canonical_slice.start < self.length) and
-                    ((0 <= canonical_slice.stop < self.length) or
+                    ((0 <= canonical_slice.stop <= self.length) or
                      (canonical_slice.stop == self.length == infinity))):
                 raise TypeError
             return CuteRange(
                 self[canonical_slice.start],
-                self[canonical_slice.stop],
+                self.__getitem__(canonical_slice.stop,
+                                 allow_out_of_range=True),
                 self.step * canonical_slice.step
             )
         else:
diff --git a/source_py3/python_toolbox/sequence_tools/cute_range.py b/source_py3/python_toolbox/sequence_tools/cute_range.py
@@ -173,7 +173,7 @@ def __getitem__(self, i, allow_out_of_range=False):
         from python_toolbox import sequence_tools
         if isinstance(i, numbers.Integral):
             if i < 0:
-                if i < y (-self.length) and not allow_out_of_range:
+                if i < (-self.length) and not allow_out_of_range:
                     raise IndexError
                 i += self.length
             if 0 <= i < self.length or allow_out_of_range:
@@ -192,7 +192,7 @@ def __getitem__(self, i, allow_out_of_range=False):
                 i, iterable_or_length=self
             )
             if not ((0 <= canonical_slice.start < self.length) and
-                    ((0 <= canonical_slice.stop < self.length) or
+                    ((0 <= canonical_slice.stop <= self.length) or
                      (canonical_slice.stop == self.length == infinity))):
                 raise TypeError
             return CuteRange(
