stream: Return errno value as first arg of OSError exception.

pfalcon · pfalcon · commit 0c7b26c0f816 · 2014-10-16T02:58:52.000+03:00
This is CPython-compatible convention established yet in acb1388.
diff --git a/py/stream.c b/py/stream.c
@@ -110,7 +110,7 @@ STATIC mp_obj_t stream_read(uint n_args, const mp_obj_t *args) {
                     }
                     break;
                 }
-                nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", error));
+                nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
             }
 
             if (out_sz < more_bytes) {
@@ -178,7 +178,7 @@ STATIC mp_obj_t stream_read(uint n_args, const mp_obj_t *args) {
             // this as EOF.
             return mp_const_none;
         }
-        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", error));
+        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
     } else {
         mp_obj_t s = mp_obj_new_str_of_type(STREAM_CONTENT_TYPE(o->type->stream_p), buf, out_sz); // will reallocate to use exact size
         m_free(buf, sz);
@@ -204,7 +204,7 @@ mp_obj_t mp_stream_write(mp_obj_t self_in, const void *buf, mp_uint_t len) {
             // see abobe.
             return mp_const_none;
         }
-        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", error));
+        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
     } else {
         return MP_OBJ_NEW_SMALL_INT(out_sz);
     }
@@ -240,7 +240,7 @@ STATIC mp_obj_t stream_readall(mp_obj_t self_in) {
                 }
                 break;
             }
-            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", error));
+            nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
         }
         if (out_sz == 0) {
             break;
@@ -293,7 +293,7 @@ STATIC mp_obj_t stream_unbuffered_readline(uint n_args, const mp_obj_t *args) {
 
         mp_uint_t out_sz = o->type->stream_p->read(o, p, 1, &error);
         if (out_sz == MP_STREAM_ERROR) {
-            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", error));
+            nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
         }
         if (out_sz == 0) {
             // Back out previously added byte

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ STATIC mp_obj_t stream_read(uint n_args, const mp_obj_t *args) {`
`110`	`110`	`}`
`111`	`111`	`break;`
`112`	`112`	`}`
`113`		`- nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", error));`
	`113`	`+ nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`if (out_sz < more_bytes) {`
`@@ -178,7 +178,7 @@ STATIC mp_obj_t stream_read(uint n_args, const mp_obj_t *args) {`
`178`	`178`	`// this as EOF.`
`179`	`179`	`return mp_const_none;`
`180`	`180`	`}`
`181`		`- nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", error));`
	`181`	`+ nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));`
`182`	`182`	`} else {`
`183`	`183`	`mp_obj_t s = mp_obj_new_str_of_type(STREAM_CONTENT_TYPE(o->type->stream_p), buf, out_sz); // will reallocate to use exact size`
`184`	`184`	`m_free(buf, sz);`
`@@ -204,7 +204,7 @@ mp_obj_t mp_stream_write(mp_obj_t self_in, const void *buf, mp_uint_t len) {`
`204`	`204`	`// see abobe.`
`205`	`205`	`return mp_const_none;`
`206`	`206`	`}`
`207`		`- nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", error));`
	`207`	`+ nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));`
`208`	`208`	`} else {`
`209`	`209`	`return MP_OBJ_NEW_SMALL_INT(out_sz);`
`210`	`210`	`}`
`@@ -240,7 +240,7 @@ STATIC mp_obj_t stream_readall(mp_obj_t self_in) {`
`240`	`240`	`}`
`241`	`241`	`break;`
`242`	`242`	`}`
`243`		`- nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", error));`
	`243`	`+ nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));`
`244`	`244`	`}`
`245`	`245`	`if (out_sz == 0) {`
`246`	`246`	`break;`
`@@ -293,7 +293,7 @@ STATIC mp_obj_t stream_unbuffered_readline(uint n_args, const mp_obj_t *args) {`
`293`	`293`
`294`	`294`	`mp_uint_t out_sz = o->type->stream_p->read(o, p, 1, &error);`
`295`	`295`	`if (out_sz == MP_STREAM_ERROR) {`
`296`		`- nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", error));`
	`296`	`+ nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));`
`297`	`297`	`}`
`298`	`298`	`if (out_sz == 0) {`
`299`	`299`	`// Back out previously added byte`