Рефакторинг

* импорт целого модуля device, вместо его полей
master-3.5 3.5.7
parent fc783d6c22
commit a56a731d2d

@ -24,7 +24,7 @@ from calculate.lib.datavars import (Variable, VariableError, ReadonlyVariable,
VariableInterface) VariableInterface)
from calculate.lib.utils.common import getValueFromConfig from calculate.lib.utils.common import getValueFromConfig
from calculate.lib.variables import user from calculate.lib.variables import user
from calculate.lib.utils.device import sysfs import calculate.lib.utils.device as device
from calculate.lib.utils.files import (readLinesFile, process, from calculate.lib.utils.files import (readLinesFile, process,
listDirectory, readFile) listDirectory, readFile)
from calculate.desktop._cl_keys import getKey from calculate.desktop._cl_keys import getKey
@ -213,8 +213,9 @@ class VariableClDesktopXfcePointers(ReadonlyVariable):
def get(self): def get(self):
def generate(): def generate():
for input_device_name in sorted( for input_device_name in sorted(
sysfs.glob(sysfs.Path.Input, "mouse*/device/name")): device.sysfs.glob(device.sysfs.Path.Input,
data = sysfs.read(input_device_name) "mouse*/device/name")):
data = device.sysfs.read(input_device_name)
if data: if data:
yield data.strip().replace(" ", "_").replace("/","") yield data.strip().replace(" ", "_").replace("/","")

Loading…
Cancel
Save