Skip to content

Fix language matching in Windows #260

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
theotherjimmy merged 2 commits into from
Nov 3, 2017
Merged

Fix language matching in Windows #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8d1203
Add test for Japanese Windows
bridadan Nov 2, 2017
b6d9cac
Make matching logic for drives language-agnostic
bridadan Nov 2, 2017
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
7 changes: 5 additions & 2 deletions mbed_lstools/windows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,11 @@ def _drive_letters(self):
logger.debug('output: %s' % stdout)

if not retval:
drive_list = re.match('\s*Drives: (.*)', stdout.decode('utf-8')).group(1)
return drive_list.strip().replace('\\', '').split(' ')
split_index = stdout.find(b':') + 1
drive_list = stdout[split_index:]
drive_list = drive_list.strip().replace(b'\\', b'').split(b' ')
drive_list = [d.decode('utf-8') for d in drive_list]
return drive_list
return []


Expand Down
7 changes: 7 additions & 0 deletions test/os_win7.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env python
# coding: utf-8
"""
mbed SDK
Copyright (c) 2011-2015 ARM Limited
Expand Down Expand Up @@ -154,6 +155,12 @@ def test_one_nucleo_dev(self):
self.assertNotIn(expected_info, devices)
self.assertNoRegMut()

# Test multilanguage support
_cliproc.return_value = (u'\nドライブ: C:\ F:\ Z:\ \n'.encode('shift_jis'), None, 0)
devices = self.lstool.find_candidates()
self.assertNotIn(expected_info, devices)
self.assertNoRegMut()


if __name__ == '__main__':
unittest.main()