From 3c50e39d644767ea3f668bbf2146ea4c636ce8e2 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Wed, 31 May 2017 21:58:45 -0700 Subject: mpm: Removed gratuitous encode(), safer udev lookups - Udev lookups now just return empty lists when they can't find anything - Made SPI dev interface factory Py2/3 safe --- mpm/python/usrp_mpm/sysfs_gpio.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'mpm/python/usrp_mpm/sysfs_gpio.py') diff --git a/mpm/python/usrp_mpm/sysfs_gpio.py b/mpm/python/usrp_mpm/sysfs_gpio.py index 6473d87ee..ea423dc00 100644 --- a/mpm/python/usrp_mpm/sysfs_gpio.py +++ b/mpm/python/usrp_mpm/sysfs_gpio.py @@ -19,7 +19,6 @@ Access to GPIOs mapped into the PS via sysfs """ import os -from builtins import range from builtins import object import pyudev from .mpmlog import get_logger @@ -35,11 +34,11 @@ def get_all_gpio_devs(): """ try: context = pyudev.Context() - gpios = [device.sys_name.encode('ascii') + gpios = [device.sys_name for device in context.list_devices(subsystem="gpio") if os.path.exists(os.path.join( # udev probably has better ways to do this GPIO_SYSFS_BASE_DIR, - device.sys_name.encode('ascii'), + device.sys_name, GPIO_SYSFS_LABELFILE )) ] -- cgit v1.2.3