From 3e329454c5f5b4267230d87bc9bd604c36bfee69 Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Sun, 26 Jun 2022 08:09:45 -0700 Subject: [PATCH] Remove unnecessary guards for non-falsey values The containers: - CharSetGroupProber.probers - EscCharSetProber.coding_sm Never contain falsey values. Can remove the constant guard expressions. --- chardet/charsetgroupprober.py | 11 +++-------- chardet/escprober.py | 4 +--- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/chardet/charsetgroupprober.py b/chardet/charsetgroupprober.py index 778ff332..4c41ed2a 100644 --- a/chardet/charsetgroupprober.py +++ b/chardet/charsetgroupprober.py @@ -40,10 +40,9 @@ def reset(self): super().reset() self._active_num = 0 for prober in self.probers: - if prober: - prober.reset() - prober.active = True - self._active_num += 1 + prober.reset() + prober.active = True + self._active_num += 1 self._best_guess_prober = None @property @@ -64,8 +63,6 @@ def language(self): def feed(self, byte_str): for prober in self.probers: - if not prober: - continue if not prober.active: continue state = prober.feed(byte_str) @@ -92,8 +89,6 @@ def get_confidence(self): best_conf = 0.0 self._best_guess_prober = None for prober in self.probers: - if not prober: - continue if not prober.active: self.logger.debug("%s not active", prober.charset_name) continue diff --git a/chardet/escprober.py b/chardet/escprober.py index d9926115..c91c0781 100644 --- a/chardet/escprober.py +++ b/chardet/escprober.py @@ -62,8 +62,6 @@ def __init__(self, lang_filter=None): def reset(self): super().reset() for coding_sm in self.coding_sm: - if not coding_sm: - continue coding_sm.active = True coding_sm.reset() self.active_sm_count = len(self.coding_sm) @@ -84,7 +82,7 @@ def get_confidence(self): def feed(self, byte_str): for c in byte_str: for coding_sm in self.coding_sm: - if not coding_sm or not coding_sm.active: + if not coding_sm.active: continue coding_state = coding_sm.next_state(c) if coding_state == MachineState.ERROR: