From b1a62b91b18824cf58b533f75f660b073799595d Mon Sep 17 00:00:00 2001 From: Janne Hellsten Date: Wed, 13 Oct 2021 13:09:27 +0300 Subject: [PATCH] Remove use of Python walrus (:=) operator to enable running on Python 3.7 should fix #6 --- dataset_tool.py | 3 ++- gen_images.py | 3 ++- gen_video.py | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dataset_tool.py b/dataset_tool.py index e09d3d2..747189f 100644 --- a/dataset_tool.py +++ b/dataset_tool.py @@ -41,7 +41,8 @@ def parse_tuple(s: str) -> Tuple[int, int]: '4x2' returns (4,2) '0,1' returns (0,1) ''' - if m := re.match(r'^(\d+)[x,](\d+)$', s): + m = re.match(r'^(\d+)[x,](\d+)$', s) + if m: return (int(m.group(1)), int(m.group(2))) raise ValueError(f'cannot parse tuple {s}') diff --git a/gen_images.py b/gen_images.py index 1a4e898..66fdef4 100644 --- a/gen_images.py +++ b/gen_images.py @@ -31,7 +31,8 @@ def parse_range(s: Union[str, List]) -> List[int]: ranges = [] range_re = re.compile(r'^(\d+)-(\d+)$') for p in s.split(','): - if m := range_re.match(p): + m = range_re.match(p) + if m: ranges.extend(range(int(m.group(1)), int(m.group(2))+1)) else: ranges.append(int(p)) diff --git a/gen_video.py b/gen_video.py index 2556544..253360d 100644 --- a/gen_video.py +++ b/gen_video.py @@ -100,7 +100,8 @@ def parse_range(s: Union[str, List[int]]) -> List[int]: ranges = [] range_re = re.compile(r'^(\d+)-(\d+)$') for p in s.split(','): - if m := range_re.match(p): + m = range_re.match(p) + if m: ranges.extend(range(int(m.group(1)), int(m.group(2))+1)) else: ranges.append(int(p)) @@ -116,7 +117,8 @@ def parse_tuple(s: Union[str, Tuple[int,int]]) -> Tuple[int, int]: '0,1' returns (0,1) ''' if isinstance(s, tuple): return s - if m := re.match(r'^(\d+)[x,](\d+)$', s): + m = re.match(r'^(\d+)[x,](\d+)$', s) + if m: return (int(m.group(1)), int(m.group(2))) raise ValueError(f'cannot parse tuple {s}')