8000 unix: OSError's args[0] should be errno numeric value. · rpavlik/circuitpython@acb1388 · GitHub
[go: up one dir, main page]

Skip to content

Commit acb1388

Browse files
committed
unix: OSError's args[0] should be errno numeric value.
Well, Python3 also defines an attribute for that, but that's bloat.
1 parent dec31bb commit acb1388

File tree

3 files changed

+5
-5
lines changed

3 file 10000 s changed

+5
-5
lines changed

unix/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ STATIC mp_obj_t fdfile_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const
106106

107107
int fd = open(fname, mode, 0644);
108108
if (fd == -1) {
109-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", errno));
109+
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno)));
110110
}
111111
return fdfile_new(fd);
112112
}

unix/modffi.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ STATIC mp_obj_t ffimod_func(uint n_args, const mp_obj_t *args) {
145145

146146
void *sym = dlsym(self->handle, symname);
147147
if (sym == NULL) {
148-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", errno));
148+
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno)));
149149
}
150150
int nparams = MP_OBJ_SMALL_INT_VALUE(mp_obj_len_maybe(args[3]));
151151
mp_obj_ffifunc_t *o = m_new_obj_var(mp_obj_ffifunc_t, ffi_type*, nparams);
@@ -219,7 +219,7 @@ STATIC mp_obj_t ffimod_var(mp_obj_t self_in, mp_obj_t vartype_in, mp_obj_t symna
219219

220220
void *sym = dlsym(self->handle, symname);
221221
if (sym == NULL) {
222-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", errno));
222+
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno)));
223223
}
224224
mp_obj_ffivar_t *o = m_new_obj(mp_obj_ffivar_t);
225225
o->base.type = &ffivar_type;
@@ -235,7 +235,7 @@ STATIC mp_obj_t ffimod_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const
235235
void *mod = dlopen(fname, RTLD_NOW | RTLD_LOCAL);
236236

237237
if (mod == NULL) {
238-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", errno));
238+
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno)));
239239
}
240240
mp_obj_ffimod_t *o = m_new_obj(mp_obj_ffimod_t);
241241
o->base.type = type_in;

unix/modsocket.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ STATIC const mp_obj_type_t microsocket_type;
3333
// Helper functions
3434
#define RAISE_ERRNO(err_flag, error_val) \
3535
{ if (err_flag == -1) \
36-
{ nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", error_val)); } }
36+
{ nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error_val))); } }
3737

3838
STATIC mp_obj_socket_t *socket_new(int fd) {
3939
mp_obj_socket_t *o = m_new_obj(mp_obj_socket_t);

0 commit comments

Comments
 (0)
0