MicroPythonNexus
diff --git a/‎py/modio.c‎
Lines changed: 1 addition & 1 deletion b/‎py/modio.c‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎py/modthread.c‎
Lines changed: 1 addition & 1 deletion b/‎py/modthread.c‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎py/runtime.c‎
Lines changed: 4 additions & 0 deletions b/‎py/runtime.c‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎py/runtime.h‎
Lines changed: 1 addition & 0 deletions b/‎py/runtime.h‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎py/stream.c‎
Lines changed: 9 additions & 9 deletions b/‎py/stream.c‎
Lines changed: 9 additions & 9 deletions
@@ -102,7 +102,7 @@ STATIC mp_obj_t bufwriter_flush(mp_obj_t self_in) {
         assert(out_sz == self->len);
         self->len = 0;
         if (err != 0) {
-            nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(err)));
+            mp_raise_OSError(err);
         }
     }
 
 
@@ -93,7 +93,7 @@ STATIC mp_obj_t thread_lock_acquire(size_t n_args, const mp_obj_t *args) {
         self->locked = true;
         return mp_const_true;
     } else {
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-ret)));
+        mp_raise_OSError(-ret);
     }
     #endif
 }
 
@@ -1405,6 +1405,10 @@ NORETURN void mp_raise_TypeError(const char *msg) {
     mp_raise_msg(&mp_type_TypeError, msg);
 }
 
+NORETURN void mp_raise_OSError(int errno_) {
+    nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno_)));
+}
+
 NORETURN void mp_not_implemented(const char *msg) {
     mp_raise_msg(&mp_type_NotImplementedError, msg);
 }
@@ -137,6 +137,7 @@ NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, const char *msg);
 //NORETURN void nlr_raise_msg_varg(const mp_obj_type_t *exc_type, const char *fmt, ...);
 NORETURN void mp_raise_ValueError(const char *msg);
 NORETURN void mp_raise_TypeError(const char *msg);
+NORETURN void mp_raise_OSError(int errno_);
 NORETURN void mp_not_implemented(const char *msg); // Raise NotImplementedError with given message
 NORETURN void mp_exc_recursion_depth(void);
 
 
@@ -159,7 +159,7 @@ STATIC mp_obj_t stream_read_generic(size_t n_args, const mp_obj_t *args, byte fl
                     }
                     break;
                 }
-                nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
+                mp_raise_OSError(error);
             }
 
             if (out_sz < more_bytes) {
@@ -227,7 +227,7 @@ STATIC mp_obj_t stream_read_generic(size_t n_args, const mp_obj_t *args, byte fl
             // this as EOF.
             return mp_const_none;
         }
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
+        mp_raise_OSError(error);
     } else {
         vstr.len = out_sz;
         return mp_obj_new_str_from_vstr(STREAM_CONTENT_TYPE(stream_p), &vstr);
@@ -256,7 +256,7 @@ mp_obj_t mp_stream_write(mp_obj_t self_in, const void *buf, size_t len, byte fla
             // no single byte could be readily written to it."
             return mp_const_none;
         }
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
+        mp_raise_OSError(error);
     } else {
         return MP_OBJ_NEW_SMALL_INT(out_sz);
     }
@@ -315,7 +315,7 @@ STATIC mp_obj_t stream_readinto(size_t n_args, const mp_obj_t *args) {
         if (mp_is_nonblocking_error(error)) {
             return mp_const_none;
         }
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
+        mp_raise_OSError(error);
     } else {
         return MP_OBJ_NEW_SMALL_INT(out_sz);
     }
@@ -343,7 +343,7 @@ STATIC mp_obj_t stream_readall(mp_obj_t self_in) {
                 }
                 break;
             }
-            nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
+            mp_raise_OSError(error);
         }
         if (out_sz == 0) {
             break;
@@ -402,7 +402,7 @@ STATIC mp_obj_t stream_unbuffered_readline(size_t n_args, const mp_obj_t *args)
                     goto done;
                 }
             }
-            nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
+            mp_raise_OSError(error);
         }
         if (out_sz == 0) {
 done:
@@ -457,7 +457,7 @@ STATIC mp_obj_t stream_seek(size_t n_args, const mp_obj_t *args) {
     int error;
     mp_uint_t res = stream_p->ioctl(args[0], MP_STREAM_SEEK, (mp_uint_t)(uintptr_t)&seek_s, &error);
     if (res == MP_STREAM_ERROR) {
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
+        mp_raise_OSError(error);
     }
 
     // TODO: Could be uint64
@@ -478,7 +478,7 @@ STATIC mp_obj_t stream_flush(mp_obj_t self) {
     int error;
     mp_uint_t res = stream_p->ioctl(self, MP_STREAM_FLUSH, 0, &error);
     if (res == MP_STREAM_ERROR) {
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
+        mp_raise_OSError(error);
     }
     return mp_const_none;
 }
@@ -500,7 +500,7 @@ STATIC mp_obj_t stream_ioctl(size_t n_args, const mp_obj_t *args) {
     int error;
     mp_uint_t res = stream_p->ioctl(args[0], mp_obj_get_int(args[1]), val, &error);
     if (res == MP_STREAM_ERROR) {
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
+        mp_raise_OSError(error);
     }
 
     return mp_obj_new_int(res);
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ STATIC mp_obj_t bufwriter_flush(mp_obj_t self_in) {`
`102`	`102`	`assert(out_sz == self->len);`
`103`	`103`	`self->len = 0;`
`104`	`104`	`if (err != 0) {`
`105`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(err)));`
	`105`	`+ mp_raise_OSError(err);`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ STATIC mp_obj_t thread_lock_acquire(size_t n_args, const mp_obj_t *args) {`
`93`	`93`	`self->locked = true;`
`94`	`94`	`return mp_const_true;`
`95`	`95`	`} else {`
`96`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-ret)));`
	`96`	`+ mp_raise_OSError(-ret);`
`97`	`97`	`}`
`98`	`98`	`#endif`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1405,6 +1405,10 @@ NORETURN void mp_raise_TypeError(const char *msg) {`
`1405`	`1405`	`mp_raise_msg(&mp_type_TypeError, msg);`
`1406`	`1406`	`}`
`1407`	`1407`
	`1408`	`+NORETURN void mp_raise_OSError(int errno_) {`
	`1409`	`+ nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno_)));`
	`1410`	`+}`
	`1411`	`+`
`1408`	`1412`	`NORETURN void mp_not_implemented(const char *msg) {`
`1409`	`1413`	`mp_raise_msg(&mp_type_NotImplementedError, msg);`
`1410`	`1414`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ STATIC mp_obj_t stream_read_generic(size_t n_args, const mp_obj_t *args, byte fl`
`159`	`159`	`}`
`160`	`160`	`break;`
`161`	`161`	`}`
`162`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));`
	`162`	`+ mp_raise_OSError(error);`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`if (out_sz < more_bytes) {`
`@@ -227,7 +227,7 @@ STATIC mp_obj_t stream_read_generic(size_t n_args, const mp_obj_t *args, byte fl`
`227`	`227`	`// this as EOF.`
`228`	`228`	`return mp_const_none;`
`229`	`229`	`}`
`230`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));`
	`230`	`+ mp_raise_OSError(error);`
`231`	`231`	`} else {`
`232`	`232`	`vstr.len = out_sz;`
`233`	`233`	`return mp_obj_new_str_from_vstr(STREAM_CONTENT_TYPE(stream_p), &vstr);`
`@@ -256,7 +256,7 @@ mp_obj_t mp_stream_write(mp_obj_t self_in, const void *buf, size_t len, byte fla`
`256`	`256`	`// no single byte could be readily written to it."`
`257`	`257`	`return mp_const_none;`
`258`	`258`	`}`
`259`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));`
	`259`	`+ mp_raise_OSError(error);`
`260`	`260`	`} else {`
`261`	`261`	`return MP_OBJ_NEW_SMALL_INT(out_sz);`
`262`	`262`	`}`
`@@ -315,7 +315,7 @@ STATIC mp_obj_t stream_readinto(size_t n_args, const mp_obj_t *args) {`
`315`	`315`	`if (mp_is_nonblocking_error(error)) {`
`316`	`316`	`return mp_const_none;`
`317`	`317`	`}`
`318`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));`
	`318`	`+ mp_raise_OSError(error);`
`319`	`319`	`} else {`
`320`	`320`	`return MP_OBJ_NEW_SMALL_INT(out_sz);`
`321`	`321`	`}`
`@@ -343,7 +343,7 @@ STATIC mp_obj_t stream_readall(mp_obj_t self_in) {`
`343`	`343`	`}`
`344`	`344`	`break;`
`345`	`345`	`}`
`346`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));`
	`346`	`+ mp_raise_OSError(error);`
`347`	`347`	`}`
`348`	`348`	`if (out_sz == 0) {`
`349`	`349`	`break;`
`@@ -402,7 +402,7 @@ STATIC mp_obj_t stream_unbuffered_readline(size_t n_args, const mp_obj_t *args)`
`402`	`402`	`goto done;`
`403`	`403`	`}`
`404`	`404`	`}`
`405`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));`
	`405`	`+ mp_raise_OSError(error);`
`406`	`406`	`}`
`407`	`407`	`if (out_sz == 0) {`
`408`	`408`	`done:`
`@@ -457,7 +457,7 @@ STATIC mp_obj_t stream_seek(size_t n_args, const mp_obj_t *args) {`
`457`	`457`	`int error;`
`458`	`458`	`mp_uint_t res = stream_p->ioctl(args[0], MP_STREAM_SEEK, (mp_uint_t)(uintptr_t)&seek_s, &error);`
`459`	`459`	`if (res == MP_STREAM_ERROR) {`
`460`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));`
	`460`	`+ mp_raise_OSError(error);`
`461`	`461`	`}`
`462`	`462`
`463`	`463`	`// TODO: Could be uint64`
`@@ -478,7 +478,7 @@ STATIC mp_obj_t stream_flush(mp_obj_t self) {`
`478`	`478`	`int error;`
`479`	`479`	`mp_uint_t res = stream_p->ioctl(self, MP_STREAM_FLUSH, 0, &error);`
`480`	`480`	`if (res == MP_STREAM_ERROR) {`
`481`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));`
	`481`	`+ mp_raise_OSError(error);`
`482`	`482`	`}`
`483`	`483`	`return mp_const_none;`
`484`	`484`	`}`
`@@ -500,7 +500,7 @@ STATIC mp_obj_t stream_ioctl(size_t n_args, const mp_obj_t *args) {`
`500`	`500`	`int error;`
`501`	`501`	`mp_uint_t res = stream_p->ioctl(args[0], mp_obj_get_int(args[1]), val, &error);`
`502`	`502`	`if (res == MP_STREAM_ERROR) {`
`503`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));`
	`503`	`+ mp_raise_OSError(error);`
`504`	`504`	`}`
`505`	`505`
`506`	`506`	`return mp_obj_new_int(res);`