Merge branch 'master' of github.com:micropython/micropython

Conflicts:
	py/objstr.c
	py/py.mk
	py/stream.c
	unix/main.c
	unix/socket.c

1 files changed, 3 insertions, 1 deletions

diff --git a/unix/main.c b/unix/main.c
index 74e903c2e..facc250a7 100644
--- a/unix/main.c
+++ b/unix/main.c
@@ -22,6 +22,7 @@
 #endif
 
 extern const mp_obj_fun_native_t mp_builtin_open_obj;
+void file_init();
 void rawsocket_init();
 
 static void execute_from_lexer(mp_lexer_t *lex, mp_parse_input_kind_t input_kind, bool is_repl) {
@@ -222,7 +223,8 @@ int main(int argc, char **argv) {
     rt_store_attr(m_sys, MP_QSTR_argv, py_argv);
 
     rt_store_name(qstr_from_str("test"), test_obj_new(42));
-    rt_store_name(MP_QSTR_open, (mp_obj_t)&mp_builtin_open_obj);
+
+    file_init();
     rawsocket_init();
 
     // Here is some example code to create a class and instance of that class.