From a6eff059b92faf9746fd148af697281791b2aeed Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sat, 12 Dec 2015 00:04:01 +0200
Subject: [PATCH] unix: Rename "_os" module to "uos" for consistency with
 baremetal ports.

---
 tests/io/open_append.py     | 2 +-
 tests/run-tests-exp.py      | 2 +-
 unix/modos.c                | 4 ++--
 unix/mpconfigport.h         | 2 +-
 unix/mpconfigport_minimal.h | 2 +-
 unix/qstrdefsport.h         | 2 +-
 windows/mpconfigport.h      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/io/open_append.py b/tests/io/open_append.py
index da420a16e..2120b72f0 100644
--- a/tests/io/open_append.py
+++ b/tests/io/open_append.py
@@ -1,6 +1,6 @@
 import sys
 try:
-    import _os as os
+    import uos as os
 except ImportError:
     import os
 
diff --git a/tests/run-tests-exp.py b/tests/run-tests-exp.py
index a4ac26dba..3af8feae7 100644
--- a/tests/run-tests-exp.py
+++ b/tests/run-tests-exp.py
@@ -6,7 +6,7 @@
 # which is to be tested, so should use minimal language functionality.
 #
 import sys
-import _os as os
+import uos as os
 
 
 tests = [
diff --git a/unix/modos.c b/unix/modos.c
index faf33dac9..f681acaff 100644
--- a/unix/modos.c
+++ b/unix/modos.c
@@ -156,7 +156,7 @@ STATIC mp_obj_t mod_os_mkdir(mp_obj_t path_in) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_os_mkdir_obj, mod_os_mkdir);
 
 STATIC const mp_rom_map_elem_t mp_module_os_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__os) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
     { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mod_os_stat_obj) },
     #if MICROPY_PY_OS_STATVFS
     { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mod_os_statvfs_obj) },
@@ -171,6 +171,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_os_globals, mp_module_os_globals_table);
 
 const mp_obj_module_t mp_module_os = {
     .base = { &mp_type_module },
-    .name = MP_QSTR__os,
+    .name = MP_QSTR_uos,
     .globals = (mp_obj_dict_t*)&mp_module_os_globals,
 };
diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h
index 7a4b6e523..d85b98b8d 100644
--- a/unix/mpconfigport.h
+++ b/unix/mpconfigport.h
@@ -163,7 +163,7 @@ extern const struct _mp_obj_module_t mp_module_jni;
     MICROPY_PY_JNI_DEF \
     MICROPY_PY_TIME_DEF \
     MICROPY_PY_SOCKET_DEF \
-    { MP_ROM_QSTR(MP_QSTR__os), MP_ROM_PTR(&mp_module_os) }, \
+    { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_os) }, \
     { MP_ROM_QSTR(MP_QSTR_uselect), MP_ROM_PTR(&mp_module_uselect) }, \
     MICROPY_PY_TERMIOS_DEF \
 
diff --git a/unix/mpconfigport_minimal.h b/unix/mpconfigport_minimal.h
index 09d5fbf6d..cffc9a625 100644
--- a/unix/mpconfigport_minimal.h
+++ b/unix/mpconfigport_minimal.h
@@ -98,7 +98,7 @@
 extern const struct _mp_obj_module_t mp_module_os;
 
 #define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_OBJ_NEW_QSTR(MP_QSTR__os), (mp_obj_t)&mp_module_os }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_uos), (mp_obj_t)&mp_module_os }, \
 
 // type definitions for the specific machine
 
diff --git a/unix/qstrdefsport.h b/unix/qstrdefsport.h
index f6ba9e410..7323b97a4 100644
--- a/unix/qstrdefsport.h
+++ b/unix/qstrdefsport.h
@@ -34,7 +34,7 @@ Q(makefile)
 Q(FileIO)
 Q(flush)
 
-Q(_os)
+Q(uos)
 Q(stat)
 #if MICROPY_PY_OS_STATVFS
 Q(statvfs)
diff --git a/windows/mpconfigport.h b/windows/mpconfigport.h
index 4b13fedad..5f0b34f57 100644
--- a/windows/mpconfigport.h
+++ b/windows/mpconfigport.h
@@ -152,7 +152,7 @@ extern const struct _mp_obj_module_t mp_module_os;
 extern const struct _mp_obj_module_t mp_module_time;
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_OBJ_NEW_QSTR(MP_QSTR_utime), (mp_obj_t)&mp_module_time }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR__os), (mp_obj_t)&mp_module_os }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_uos), (mp_obj_t)&mp_module_os }, \
 
 #if MICROPY_USE_READLINE == 1
 #define MICROPY_PORT_ROOT_POINTERS \