Merge #415628 from ~jocave/plainbox-provider-checkbox:fix-network-device-info

3 files changed, 20 insertions, 35 deletions

diff --git a/bin/network_device_info.py b/bin/network_device_info.py
index bba546b..bf9362c 100755
--- a/bin/network_device_info.py
+++ b/bin/network_device_info.py
@@ -307,12 +307,10 @@ class UdevDevices():
 sys.stderr.write(err)
 return
 udev = UdevadmParser(output)
- udev.run(self)
-
- def addDevice(self, device):
- """Callback for UdevadmParser"""
- if device.category == self.category and device.interface != 'UNKNOWN':
- self._devices.append(device)
+ for device in udev.run():
+ if (device.category == self.category and
+ device.interface != 'UNKNOWN'):
+ self._devices.append(device)
 
 def devices(self):
 """Convert to list of NetworkDevice with UDev derived attrs set"""
diff --git a/bin/touchpad_confidence_bit.py b/bin/touchpad_confidence_bit.py
index 5f94bb9..ff47e6d 100755
--- a/bin/touchpad_confidence_bit.py
+++ b/bin/touchpad_confidence_bit.py
@@ -19,12 +19,10 @@ class TouchpadDevices:
 sys.stderr.write(err)
 return
 udev = UdevadmParser(output)
- udev.run(self)
-
- def addDevice(self, device):
- if getattr(device, 'category') == 'TOUCHPAD':
- self.devices[getattr(device, 'product_slug')
- ] = getattr(device, 'path')
+ for device in udev.run():
+ if getattr(device, 'category') == 'TOUCHPAD':
+ self.devices[getattr(device, 'product_slug')
+ ] = getattr(device, 'path')
 
 
 def main():
diff --git a/bin/touchpad_driver_info.py b/bin/touchpad_driver_info.py
index 9f6278f..c1c3459 100755
--- a/bin/touchpad_driver_info.py
+++ b/bin/touchpad_driver_info.py
@@ -6,19 +6,6 @@ from subprocess import Popen, PIPE, check_output, STDOUT, CalledProcessError
 from checkbox_support.parsers.udevadm import UdevadmParser
 from checkbox_support.parsers.modinfo import ModinfoParser
 
-# Command to retrieve udev information.
-COMMAND = 'udevadm info --export-db'
-
-
-class TouchResult:
-
- attributes = {}
-
- def addDevice(self, device):
- if getattr(device, 'category') == 'TOUCHPAD':
- self.attributes['driver'] = getattr(device, 'driver')
- self.attributes['product'] = getattr(device, 'product')
-
 
 class TouchpadDriver():
 
@@ -48,18 +35,20 @@ class TouchpadDriver():
 
 
 def get_touch_attributes():
- output, err = Popen(COMMAND, stdout=PIPE, shell=True).communicate()
+ cmd = 'udevadm info --export-db'
+ output, err = Popen(cmd, stdout=PIPE, shell=True).communicate()
 if err:
- print("Error running $s" % ' '.join(COMMAND))
+ print("Error running $s" % ' '.join(cmd))
 print(err)
 return None
 
 udev = UdevadmParser(StringIO(output.decode("unicode-escape")))
-
- result = TouchResult()
- udev.run(result)
-
- return result.attributes
+ attributes = {}
+ for device in udev.run():
+ if getattr(device, 'category') == 'TOUCHPAD':
+ attributes['driver'] = getattr(device, 'driver')
+ attributes['product'] = getattr(device, 'product')
+ return attributes
 
 
 def main():
@@ -68,9 +57,9 @@ def main():
 modinfo = TouchpadDriver(attributes['driver'])
 attributes['version'] = modinfo.driver_version
 print("%s: %s\n%s: %s\n%s: %s\n" % (
- 'Device', attributes['product'],
- 'Driver', attributes['driver'],
- 'Driver Version', attributes['version']))
+ 'Device', attributes['product'],
+ 'Driver', attributes['driver'],
+ 'Driver Version', attributes['version']))
 else:
 print("No Touchpad Detected")
 return 1