Skip to content

Commit 746e058

Browse files
committed
-
1 parent b85ee72 commit 746e058

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

source_py3/python_toolbox/combi/perming/perm_space.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ class PermSpace(_VariationRemovingMixin, _VariationAddingMixin,
7373
Here is the simplest possible `PermSpace`:
7474
7575
>>> perm_space = PermSpace(3)
76+
<PermSpace: 0..2>
77+
>>> perm_space[2]
78+
<Perm: (1, 0, 2)>
7679
>>> tuple(perm_space)
7780
(<Perm: (0, 1, 2)>, <Perm: (0, 2, 1)>, <Perm: (1, 0, 2)>,
7881
<Perm: (1, 2, 0)>, <Perm: (2, 0, 1)>, <Perm: (2, 1, 0)>)
@@ -151,7 +154,7 @@ class PermSpace(_VariationRemovingMixin, _VariationAddingMixin,
151154
@classmethod
152155
def coerce(cls, argument):
153156
'''Make `argument` into something of class `cls` if it isn't.'''
154-
if isinstance(argument, PermSpace):
157+
if isinstance(argument, cls):
155158
return argument
156159
else:
157160
return cls(argument)

source_py3/python_toolbox/sequence_tools/cute_range.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ def short_repr(self):
166166
if self.step != 1:
167167
return self._repr
168168
else:
169-
return '%s..%s' % (self.start, self.stop)
169+
return '%s..%s' % (self.start, self.stop - 1)
170170

171171

172172
def __getitem__(self, i, allow_out_of_range=False):

source_py3/test_python_toolbox/test_sequence_tools/test_cute_range.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@
99
infinity = float('inf')
1010

1111

12+
13+
1214
def test():
1315
for x, y in zip((CuteRange(10.4, -float('inf'), -7.1)[:5]),
1416
(10.4, 3.3, -3.8, -10.9, -18.0, -25.1)):
1517
assert abs(x - y) < 0.000001
1618

1719

18-
1920
def test_finite():
2021
finite_range_arguments_tuples = (
2122
(10,), (3,), (20, 30), (20, 30, 2), (20, 30, -2)
@@ -77,7 +78,7 @@ def test_float():
7778

7879

7980
def test_short_repr():
80-
assert CuteRange(7, 10).short_repr == '7..10'
81+
assert CuteRange(7, 10).short_repr == '7..9'
8182
assert CuteRange(7, 10, 3).short_repr == 'CuteRange(7, 10, 3)'
8283
assert CuteRange(-8, infinity).short_repr == '-8..inf'
8384
assert CuteRange(8, -infinity, -1).short_repr == 'CuteRange(8, -inf, -1)'

0 commit comments

Comments
 (0)