p2p-ld/numpydantic
1
0
Fork 0
mirror of https://github.com/p2p-ld/numpydantic.git synced 2024-09-19 23:44:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

python 3.9 compatible slice unpacking

Browse source
This commit is contained in:
sneakers-the-rat 2024-05-20 19:26:22 -07:00
parent e2231cc9f0
commit 2d39c46b89
Signed by untrusted user who does not match committer: jonny
GPG key ID: 6DCB96EF1E4D232D
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/numpydantic/interface/video.py
View file

@ -2,7 +2,6 @@
Interface to support treating videos like arrays using OpenCV Interface to support treating videos like arrays using OpenCV
""" """
import pdb
from pathlib import Path from pathlib import Path
from typing import Any, Optional, Tuple, Union from typing import Any, Optional, Tuple, Union
@ -135,7 +134,9 @@ class VideoProxy:
if isinstance(item[0], int): if isinstance(item[0], int):
# single frame # single frame
frame = self._get_frame(item[0]) frame = self._get_frame(item[0])
return frame[*item[1:]] # syntax doesn't work in 3.9 but would be more explicit...
# return frame[*item[1:]]
return frame[item[1:]]
elif isinstance(item[0], slice): elif isinstance(item[0], slice):
frames = [] frames = []
@ -151,7 +152,11 @@ class VideoProxy:
for i in range(fslice.start, fslice.stop, fslice.step): for i in range(fslice.start, fslice.stop, fslice.step):
frames.append(self._get_frame(i)) frames.append(self._get_frame(i))
frame = np.stack(frames) frame = np.stack(frames)
return frame[:, *item[1:]] # syntax doesn't work in 3.9 but would be simpler..
# return frame[:, *item[1:]]
# construct a new slice instead
new_slice = (slice(None, None, None), *item[1:])
return frame[new_slice]
else: # pragma: no cover else: # pragma: no cover
raise ValueError(f"indices must be an int or a slice! got {item}") raise ValueError(f"indices must be an int or a slice! got {item}")