fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2025-12-25 18:40:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools: flake8 fixes, typo fixes and missing exception handling

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2019-03-15 11:19:22 +10:00
parent d77a42a84c
commit a4b9813b92
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tools/libinput-measure-fuzz.py
View file

@ -128,9 +128,9 @@ class Device(object):
return (xfuzz, yfuzz)
def check_axis(self):
def check_axes(self):
'''
Returns a duple of (xfuzz, yfuzz) with the fuzz as set on the device
Returns a tuple of (xfuzz, yfuzz) with the fuzz as set on the device
axis. Returns None if no fuzz is set.
'''
# capabilities returns a dict with the EV_* codes as key,
@ -216,12 +216,11 @@ def handle_existing_entry(device, fuzz):
template += [' EVDEV_ABS_35={}'.format(overrides[0x35]),
' EVDEV_ABS_36={}'.format(overrides[0x36])]
found = False
print('Checking in {}... '.format(OVERRIDE_HWDB_FILE), end='')
entry, prefix, lineno = check_file_for_lines(OVERRIDE_HWDB_FILE, template)
if entry is not None:
print_green('found')
print('The existing hwdb entry can be overwritten');
print('The existing hwdb entry can be overwritten')
return False
else:
print_red('not found')
@ -231,7 +230,7 @@ def handle_existing_entry(device, fuzz):
print_green('found')
else:
print_red('not found')
print('The device has a hwdb override defined but it\'s not where I expected it to be.');
print('The device has a hwdb override defined but it\'s not where I expected it to be.')
print('Please look at the libinput documentation for more details.')
print('Exiting now.')
return True
@ -304,7 +303,7 @@ def test_hwdb_entry(device, fuzz):
print_bold('Testing... ', end='')
d = Device(device.path)
f = d.check_axis()
f = d.check_axes()
if fuzz == f[0] and fuzz == f[1]:
print_green('Success')
return True
@ -403,7 +402,7 @@ def write_udev_rule(device, fuzz):
fname = OVERRIDE_HWDB_FILE
try:
fd = open(fname, 'x')
except FileExistsError as e:
except FileExistsError:
yesno = input('File {} exists, overwrite? [Y/n] '.format(fname))
if yesno.lower == 'n':
return
@ -445,18 +444,20 @@ def main(args):
fuzz = device.check_property()
print_fuzz('udev property', fuzz)
fuzz = device.check_axis()
fuzz = device.check_axes()
print_fuzz('axes', fuzz)
userfuzz = args.fuzz
if userfuzz is not None:
write_udev_rule(device, userfuzz)
except PermissionError as e:
except PermissionError:
print('Permission denied, please re-run as root')
except InvalidConfigurationError as e:
print('Error: {}'.format(e))
except KeyboardInterrupt as e:
except InvalidDeviceError as e:
print('Error: {}'.format(e))
except KeyboardInterrupt:
print('Exited on user request')