summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a>2013-10-11 01:51:40 +0000
committercliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a>2013-10-11 01:51:40 +0000
commit6de9e95339c3b4c2c5f05803cb935995cccaf243 (patch)
tree03db694f86ee2b3812388adf5bb27f4f96bf7897
parent1d7799e5530ffa5877bacaada4481645ee427966 (diff)
downloadpyserial-6de9e95339c3b4c2c5f05803cb935995cccaf243.tar.gz
[Bug pyserial:125] Undefined 'base' on list_ports_posix.py, function usb_lsusb
git-svn-id: http://svn.code.sf.net/p/pyserial/code/trunk/pyserial@467 f19166aa-fa4f-0410-85c2-fa1106f25c8a
-rw-r--r--CHANGES.txt1
-rw-r--r--serial/tools/list_ports_posix.py5
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 5878280..4945c15 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -458,6 +458,7 @@ Bugfixes (posix):
- [Bug 3518380] python3.2 -m serial.tools.list_ports error
- [Bug pyserial:137] Patch to add non-standard baudrates to Cygwin
- [Bug pyserial:141] open: Pass errno from IOError to SerialException
+- [Bug pyserial:125] Undefined 'base' on list_ports_posix.py, function usb_lsusb
Bugfixes (win32):
diff --git a/serial/tools/list_ports_posix.py b/serial/tools/list_ports_posix.py
index 974c037..3e2da72 100644
--- a/serial/tools/list_ports_posix.py
+++ b/serial/tools/list_ports_posix.py
@@ -68,9 +68,10 @@ if plat[:5] == 'linux': # Linux (confirmed)
)
def usb_lsusb_string(sysfs_path):
- base = os.path.basename(os.path.realpath(sysfs_path))
- bus, dev = base.split('-')
+ base = os.path.basename(os.path.realpath(sysfs_path))
+ bus = base.split('-')[0]
try:
+ dev = int(open(os.path.join(sysfs_path, 'devnum')).readline().strip())
desc = popen(['lsusb', '-v', '-s', '%s:%s' % (bus, dev)])
# descriptions from device
iManufacturer = re_group('iManufacturer\s+\w+ (.+)', desc)