matzman/hddfancontrol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace assert by RuntimeError for critical check.

Browse Source 
To be compatible with Python -O startup option, which disables asserts.
This commit is contained in:
desbma
2015-01-15 21:50:19 +01:00
parent 91dcbcb960
commit 14e211a0b4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hddfancontrol/__init__.py
+4 -1
View File
@@ -182,6 +182,10 @@ class Fan:
assert(0 <= stop_value <= 255) assert(0 <= stop_value <= 255)
self.id = id self.id = id
self.pwm_filepath = pwm_filepath self.pwm_filepath = pwm_filepath
if stat.S_ISBLK(os.stat(self.pwm_filepath).st_mode):
# we don't want to write to a block device in setPwmValue
# command line parameters have probably been mixed up
raise RuntimeError("%s is a block device, PWM /sys file expected" % (self.pwm_filepath))
pwm_num = int(__class__.LAST_DIGITS_REGEX.search(self.pwm_filepath).group(1)) pwm_num = int(__class__.LAST_DIGITS_REGEX.search(self.pwm_filepath).group(1))
self.fan_input_filepath = os.path.join(os.path.dirname(self.pwm_filepath), self.fan_input_filepath = os.path.join(os.path.dirname(self.pwm_filepath),
"fan%u_input" % (pwm_num)) "fan%u_input" % (pwm_num))
@@ -251,7 +255,6 @@ class Fan:
def setPwmValue(self, value): def setPwmValue(self, value):
""" Set fan PWM value. """ """ Set fan PWM value. """
assert(0 <= value <= 255) assert(0 <= value <= 255)
assert(not stat.S_ISBLK(os.stat(self.pwm_filepath).st_mode)) # check we are not mistakenly writing to a device file
enabled_filepath = "%s_enable" % (self.pwm_filepath) enabled_filepath = "%s_enable" % (self.pwm_filepath)
with open(enabled_filepath, "r+t") as enabled_file: with open(enabled_filepath, "r+t") as enabled_file:
enabled_val = int(enabled_file.read().strip()) enabled_val = int(enabled_file.read().strip())