diff --git a/platform/broadcom/sonic-platform-modules-accton/as9736-64d/classes/fanutil.py b/platform/broadcom/sonic-platform-modules-accton/as9736-64d/classes/fanutil.py index ef1a7e657826..1df07d34fef5 100755 --- a/platform/broadcom/sonic-platform-modules-accton/as9736-64d/classes/fanutil.py +++ b/platform/broadcom/sonic-platform-modules-accton/as9736-64d/classes/fanutil.py @@ -135,7 +135,7 @@ def _set_fan_node_val(self, fan_num, node_num, val): try: val_file.close() - except BaseException: + except Exception: logging.debug('GET. unable to close file. device_path:%s', device_path) return None diff --git a/platform/broadcom/sonic-platform-modules-accton/as9736-64d/classes/thermalutil.py b/platform/broadcom/sonic-platform-modules-accton/as9736-64d/classes/thermalutil.py index cdda12e342c5..2555640e39a2 100755 --- a/platform/broadcom/sonic-platform-modules-accton/as9736-64d/classes/thermalutil.py +++ b/platform/broadcom/sonic-platform-modules-accton/as9736-64d/classes/thermalutil.py @@ -91,7 +91,7 @@ def _get_thermal_val(self, thermal_num): return None try: val_file.close() - except BaseException: + except Exception: logging.debug('GET. unable to close file. device_path:%s', device_path) return None diff --git a/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/helper.py b/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/helper.py index 6653ab163dac..66f50fece554 100644 --- a/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/helper.py +++ b/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/helper.py @@ -290,7 +290,7 @@ def set_high_threshold(self, temperature): try: if temperature != NOT_AVAILABLE: - tmp = float(temperature) + float(temperature) except ValueError: raise ValueError('The parameter requires a float string. ex:\"30.1\"') @@ -319,7 +319,7 @@ def set_low_threshold(self, temperature): try: if temperature != NOT_AVAILABLE: - tmp = float(temperature) + float(temperature) except ValueError: raise ValueError('The parameter requires a float string. ex:\"30.1\"') @@ -348,7 +348,7 @@ def set_high_critical_threshold(self, temperature): try: if temperature != NOT_AVAILABLE: - tmp = float(temperature) + float(temperature) except ValueError: raise ValueError('The parameter requires a float string. ex:\"30.1\"') @@ -377,7 +377,7 @@ def set_low_critical_threshold(self, temperature): try: if temperature != NOT_AVAILABLE: - tmp = float(temperature) + float(temperature) except ValueError: raise ValueError('The parameter requires a float string. ex:\"30.1\"') diff --git a/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/psu.py b/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/psu.py index c2e2d11b4208..4b70ea008b57 100644 --- a/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/psu.py +++ b/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/psu.py @@ -150,8 +150,6 @@ def get_status_led(self): 0: self.STATUS_LED_COLOR_AMBER }.get(status, self.STATUS_LED_COLOR_OFF) - return False - def get_temperature(self): """ Retrieves current temperature reading from PSU diff --git a/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/sfp.py b/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/sfp.py index a03719ce91b6..078de1c7ba6b 100644 --- a/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/sfp.py +++ b/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/sfp.py @@ -349,7 +349,7 @@ def _convert_raw_to_byte(self, raw, num_bytes): for n in range(0, num_bytes): eeprom_raw[n] = hex(raw[n])[2:].zfill(2) - except BaseException: + except Exception: return None return eeprom_raw diff --git a/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/thermal.py b/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/thermal.py index e9d9d88872e6..70ac5bf95633 100644 --- a/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/thermal.py +++ b/platform/broadcom/sonic-platform-modules-accton/as9736-64d/sonic_platform/thermal.py @@ -261,12 +261,12 @@ def set_high_threshold(self, temperature): """ try: value = float(temperature) - except: + except Exception: return False try: self.conf.set_high_threshold(str(value)) - except: + except Exception: return False return True @@ -392,12 +392,12 @@ def set_high_critical_threshold(self, temperature): """ try: value = float(temperature) - except: + except Exception: return False try: self.conf.set_high_critical_threshold(str(value)) - except: + except Exception: return False return True