Skip to content

Commit 5558470

Browse files
committed
Removed ofind() and rofind()
1 parent 2a98347 commit 5558470

File tree

3 files changed

+0
-122
lines changed

3 files changed

+0
-122
lines changed

src/bytesparse/base.py

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2432,32 +2432,6 @@ def keys(
24322432
"""
24332433
...
24342434

2435-
@abc.abstractmethod
2436-
def ofind(
2437-
self,
2438-
item: Union[AnyBytes, Value],
2439-
start: Optional[Address] = None,
2440-
endex: Optional[Address] = None,
2441-
) -> Optional[Address]:
2442-
r"""Index of an item.
2443-
2444-
Arguments:
2445-
item (items):
2446-
Value to find. Can be either some byte string or an integer.
2447-
2448-
start (int):
2449-
Inclusive start of the searched range.
2450-
If ``None``, :attr:`start` is considered.
2451-
2452-
endex (int):
2453-
Exclusive end of the searched range.
2454-
If ``None``, :attr:`endex` is considered.
2455-
2456-
Returns:
2457-
int: The index of the first item equal to `value`, or ``None``.
2458-
"""
2459-
...
2460-
24612435
@abc.abstractmethod
24622436
def peek(
24632437
self,
@@ -2597,32 +2571,6 @@ def rindex(
25972571
"""
25982572
...
25992573

2600-
@abc.abstractmethod
2601-
def rofind(
2602-
self,
2603-
item: Union[AnyBytes, Value],
2604-
start: Optional[Address] = None,
2605-
endex: Optional[Address] = None,
2606-
) -> Optional[Address]:
2607-
r"""Index of an item, reversed search.
2608-
2609-
Arguments:
2610-
item (items):
2611-
Value to find. Can be either some byte string or an integer.
2612-
2613-
start (int):
2614-
Inclusive start of the searched range.
2615-
If ``None``, :attr:`start` is considered.
2616-
2617-
endex (int):
2618-
Exclusive end of the searched range.
2619-
If ``None``, :attr:`endex` is considered.
2620-
2621-
Returns:
2622-
int: The index of the last item equal to `value`, or ``None``.
2623-
"""
2624-
...
2625-
26262574
@abc.abstractmethod
26272575
def rvalues(
26282576
self,

src/bytesparse/inplace.py

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2044,18 +2044,6 @@ def keys(
20442044
endex = self.endex
20452045
yield from range(start, endex)
20462046

2047-
def ofind(
2048-
self,
2049-
item: Union[AnyBytes, Value],
2050-
start: Optional[Address] = None,
2051-
endex: Optional[Address] = None,
2052-
) -> Optional[Address]:
2053-
2054-
try:
2055-
return self.index(item, start, endex)
2056-
except ValueError:
2057-
return None
2058-
20592047
def peek(
20602048
self,
20612049
address: Address,
@@ -2380,18 +2368,6 @@ def rindex(
23802368
else:
23812369
raise ValueError('subsection not found')
23822370

2383-
def rofind(
2384-
self,
2385-
item: Union[AnyBytes, Value],
2386-
start: Optional[Address] = None,
2387-
endex: Optional[Address] = None,
2388-
) -> Optional[Address]:
2389-
2390-
try:
2391-
return self.rindex(item, start, endex)
2392-
except ValueError:
2393-
return None
2394-
23952371
def rvalues(
23962372
self,
23972373
start: Optional[Union[Address, EllipsisType]] = None,
@@ -3295,16 +3271,6 @@ def keys(
32953271
endex = endex_ # restore
32963272
yield from super().keys(start=start, endex=endex)
32973273

3298-
def ofind(
3299-
self,
3300-
item: Union[AnyBytes, Value],
3301-
start: Optional[Address] = None,
3302-
endex: Optional[Address] = None,
3303-
) -> Optional[Address]:
3304-
3305-
start, endex = self._rectify_span(start, endex)
3306-
return super().ofind(item, start=start, endex=endex)
3307-
33083274
def peek(
33093275
self,
33103276
address: Address,
@@ -3416,16 +3382,6 @@ def rindex(
34163382
start, endex = self._rectify_span(start, endex)
34173383
return super().rindex(item, start=start, endex=endex)
34183384

3419-
def rofind(
3420-
self,
3421-
item: Union[AnyBytes, Value],
3422-
start: Optional[Address] = None,
3423-
endex: Optional[Address] = None,
3424-
) -> Optional[Address]:
3425-
3426-
start, endex = self._rectify_span(start, endex)
3427-
return super().rofind(item, start=start, endex=endex)
3428-
34293385
def rvalues(
34303386
self,
34313387
start: Optional[Union[Address, EllipsisType]] = None,

tests/_common.py

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,32 +1110,6 @@ def test___len__(self):
11101110
assert len(memory) == memory.endex - memory.start
11111111
assert len(memory) == (22 - 2)
11121112

1113-
def test_ofind_doctest(self):
1114-
pass # no doctest
1115-
1116-
def test_ofind(self):
1117-
Memory = self.Memory
1118-
1119-
memory = Memory.from_blocks(create_hello_world_blocks())
1120-
1121-
assert memory.ofind(b'X') is None
1122-
assert memory.ofind(b'W') == 10
1123-
assert memory.ofind(b'o') == 6
1124-
assert memory.ofind(b'l') == 4
1125-
1126-
def test_rofind_doctest(self):
1127-
pass # no doctest
1128-
1129-
def test_rofind(self):
1130-
Memory = self.Memory
1131-
1132-
memory = Memory.from_blocks(create_hello_world_blocks())
1133-
1134-
assert memory.rofind(b'X') is None
1135-
assert memory.rofind(b'W') == 10
1136-
assert memory.rofind(b'o') == 11
1137-
assert memory.rofind(b'l') == 13
1138-
11391113
def test_find_doctest(self):
11401114
pass # no doctest
11411115

0 commit comments

Comments
 (0)