feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Fix error with unicode for serial ports description

Browse Source
This commit is contained in:
Ivan Kravets
2016-01-26 20:30:45 +02:00
parent 9ede9d3c6d
commit ec19341e05
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformio/__init__.py
View File

@ -14,7 +14,7 @@
import sys import sys
VERSION = (2, 8, "0.dev4") VERSION = (2, 8, "0.dev5")
__version__ = ".".join([str(s) for s in VERSION]) __version__ = ".".join([str(s) for s in VERSION])
__title__ = "platformio" __title__ = "platformio"

15
platformio/util.py
View File

@ -272,9 +272,18 @@ def get_serialports():
from serial.tools.list_ports import comports from serial.tools.list_ports import comports
except ImportError: except ImportError:
raise exception.GetSerialPortsError(os.name) raise exception.GetSerialPortsError(os.name)
result = [{"port": p, "description": unicode(d, errors='ignore'),
"hwid": h} result = []
for p, d, h in comports() if p] for p, d, h in comports():
if not p:
continue
if "windows" in get_systype():
try:
d = unicode(d, errors="ignore")
except TypeError:
pass
result.append({"port": p, "description": d, "hwid": h})
# fix for PySerial # fix for PySerial
if not result and system() == "Darwin": if not result and system() == "Darwin":
for p in glob("/dev/tty.*"): for p in glob("/dev/tty.*"):