From a56a731d2da810639b0af2b5aae571b9d604e257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Tue, 12 Sep 2017 11:33:32 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * импорт целого модуля device, вместо его полей --- pym/desktop/variables/desktop.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pym/desktop/variables/desktop.py b/pym/desktop/variables/desktop.py index 0b99622..ca2f1d7 100644 --- a/pym/desktop/variables/desktop.py +++ b/pym/desktop/variables/desktop.py @@ -24,7 +24,7 @@ from calculate.lib.datavars import (Variable, VariableError, ReadonlyVariable, VariableInterface) from calculate.lib.utils.common import getValueFromConfig 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, listDirectory, readFile) from calculate.desktop._cl_keys import getKey @@ -213,8 +213,9 @@ class VariableClDesktopXfcePointers(ReadonlyVariable): def get(self): def generate(): for input_device_name in sorted( - sysfs.glob(sysfs.Path.Input, "mouse*/device/name")): - data = sysfs.read(input_device_name) + device.sysfs.glob(device.sysfs.Path.Input, + "mouse*/device/name")): + data = device.sysfs.read(input_device_name) if data: yield data.strip().replace(" ", "_").replace("/","")