Rename os support modules

ARMmbed · Oct 5, 2017 · 3633b20 · 3633b20
1 parent 447fbf6
commit 3633b20
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/mbed_lstools/lstools_darwin.py → mbed_lstools/darwin.py b/mbed_lstools/lstools_darwin.py → mbed_lstools/darwin.py
diff --git a/mbed_lstools/lstools_linux_generic.py → mbed_lstools/linux.py b/mbed_lstools/lstools_linux_generic.py → mbed_lstools/linux.py
diff --git a/mbed_lstools/main.py b/mbed_lstools/main.py
@@ -39,13 +39,13 @@ def create(**kwargs):
     mbed_os = mbed_os_support()
     if mbed_os is not None:
         if mbed_os == 'Windows7':
-            from .lstools_win7 import MbedLsToolsWin7
+            from .windows import MbedLsToolsWin7
             result = MbedLsToolsWin7(**kwargs)
         elif mbed_os == 'LinuxGeneric':
-            from .lstools_linux_generic import MbedLsToolsLinuxGeneric
+            from .linux import MbedLsToolsLinuxGeneric
             result = MbedLsToolsLinuxGeneric(**kwargs)
         elif mbed_os == 'Darwin':
-            from .lstools_darwin import MbedLsToolsDarwin
+            from .darwin import MbedLsToolsDarwin
             result = MbedLsToolsDarwin(**kwargs)
     return result
 

diff --git a/mbed_lstools/lstools_win7.py → mbed_lstools/windows.py b/mbed_lstools/lstools_win7.py → mbed_lstools/windows.py
diff --git a/test/os_linux_generic.py b/test/os_linux_generic.py
@@ -18,8 +18,7 @@
 
 import unittest
 from mock import patch
-from mbed_lstools.lstools_linux_generic import MbedLsToolsLinuxGeneric
-from mbed_lstools.platform_database import LOCAL_PLATFORM_DATABASE
+from mbed_lstools.linux import MbedLsToolsLinuxGeneric
 
 
 class LinuxPortTestCase(unittest.TestCase):
@@ -40,7 +39,7 @@ def tearDown(self):
     ]
 
     def test_get_mount_point_basic(self):
-        with patch('mbed_lstools.lstools_linux_generic.MbedLsToolsLinuxGeneric._run_cli_process') as _cliproc:
+        with patch('mbed_lstools.linux.MbedLsToolsLinuxGeneric._run_cli_process') as _cliproc:
             _cliproc.return_value = (b'\n'.join(self.vfat_devices), None, 0)
             mount_dict = dict(self.linux_generic._fat_mounts())
             _cliproc.assert_called_once_with('mount')
@@ -64,7 +63,7 @@ def test_get_mount_point_basic(self):
     ]
 
     def test_get_mount_point_ext(self):
-        with patch('mbed_lstools.lstools_linux_generic.MbedLsToolsLinuxGeneric._run_cli_process') as _cliproc:
+        with patch('mbed_lstools.linux.MbedLsToolsLinuxGeneric._run_cli_process') as _cliproc:
             _cliproc.return_value = (b'\n'.join(self.vfat_devices_ext), None, 0)
             mount_dict = dict(self.linux_generic._fat_mounts())
             _cliproc.assert_called_once_with('mount')
@@ -80,10 +79,10 @@ def test_get_mount_point_ext(self):
         self.assertEqual('/mnt/DAPLINK__', mount_dict['/dev/sdi'])
 
     def find_candidates_with_patch(self, mount_list, link_dict, listdir_dict):
-        with patch('mbed_lstools.lstools_linux_generic.MbedLsToolsLinuxGeneric._run_cli_process') as _cliproc,\
-             patch('mbed_lstools.lstools_linux_generic.readlink') as _readlink,\
-             patch('mbed_lstools.lstools_linux_generic.listdir') as _listdir,\
-             patch('mbed_lstools.lstools_linux_generic.isdir') as _isdir:
+        with patch('mbed_lstools.linux.MbedLsToolsLinuxGeneric._run_cli_process') as _cliproc,\
+             patch('mbed_lstools.linux.readlink') as _readlink,\
+             patch('mbed_lstools.linux.listdir') as _listdir,\
+             patch('mbed_lstools.linux.isdir') as _isdir:
             _isdir.return_value = True
             _cliproc.return_value = (b'\n'.join(mount_list), None, 0)
             def do_readlink(link):
@@ -347,3 +346,4 @@ def test_get_detected_3_k64f(self):
 
 if __name__ == '__main__':
     unittest.main()
+
diff --git a/test/os_win7.py b/test/os_win7.py
@@ -26,7 +26,7 @@
 sys.modules['winreg'] = _winreg
 
 
-from mbed_lstools.lstools_win7 import MbedLsToolsWin7
+from mbed_lstools.windows import MbedLsToolsWin7
 
 
 class Win7TestCase(unittest.TestCase):