From b0dfd434956218a920a85562369a9646a4685130 Mon Sep 17 00:00:00 2001 From: Patrick Elmer Date: Sat, 13 May 2023 12:08:27 +0900 Subject: [PATCH] Refactor change.py --- soundchanger/change.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/soundchanger/change.py b/soundchanger/change.py index b867e1a..584368e 100644 --- a/soundchanger/change.py +++ b/soundchanger/change.py @@ -80,13 +80,10 @@ def apply( changes = [changes] return_str = isinstance(strings, str) - if isinstance(strings, str): - strings = [strings] - else: - strings = strings.copy() + strings = [strings] if isinstance(strings, str) else strings.copy() for change in changes: - if is_valid_change(change, ignore_errors=ignore_errors) == False: + if not is_valid_change(change, ignore_errors=ignore_errors): continue change = reformat_change_to_regex(change, categories=categories, zero_characters=zero_characters) @@ -114,7 +111,7 @@ def is_valid_change(change, ignore_errors=True): valid = re.search(r'^[^>_/]+?>[^>_/]*?/?(:?[^>_/]*?_+[^>_/]*)?$', change) if ignore_errors: - return valid != None + return valid is not None if not valid: raise ValueError(f"Change {change} is not a valid sound change.") return True @@ -167,10 +164,7 @@ def split_change(change): environment = re.sub('_+', '_', environment) original, change_to = change.split('>') - if '_' in environment: - before, after = environment.split('_') - else: - before = after = '' + before, after = environment.split('_') if '_' in environment else ('', '') return (original, change_to, before, after)