Skip to content

Try quick way first and fall back to robust way if it fails. #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 16, 2020
Merged

Try quick way first and fall back to robust way if it fails. #225

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c1fe6c
Try quick way first and fall back to robust way if it fails.
madchutney Apr 16, 2020
404bf68
Remove soup strainer
madchutney Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/mbed_os_tools/detect/darwin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,18 @@ def _plist_from_popen(popen):
if not out:
return []
try:
# Beautiful soup ensures the XML is properly formed after it is parsed
# so that it can be used by other less lenient commands without problems
xml_representation = BeautifulSoup(out.decode('utf8'), 'xml')
if not xml_representation.get_text():
# The output is not in the XML format
try:
# Try simple and fast first if this fails fall back to the slower but better process
return loads(out)
return loads(xml_representation.decode().encode('utf8'))
except ExpatError:
# Beautiful soup ensures the XML is properly formed after it is parsed
# so that it can be used by other less lenient commands without problems
xml_representation = BeautifulSoup(out.decode('utf8'), 'xml')

if not xml_representation.get_text():
# The output is not in the XML format
return loads(out)
return loads(xml_representation.decode().encode('utf8'))
except ExpatError:
return []

Expand Down