Commit 1e19b24e authored by Paul Sokolovsky's avatar Paul Sokolovsky
Browse files

io.File, socket types: Add fileno() method.

Implementation is duplicated, but tolerate this for now, because there's
no clear idea how to de-dup it.
parent 9945f338
import sys
print(sys.stdin.fileno())
print(sys.stdout.fileno())
...@@ -48,6 +48,12 @@ static mp_obj_t fdfile_close(mp_obj_t self_in) { ...@@ -48,6 +48,12 @@ static mp_obj_t fdfile_close(mp_obj_t self_in) {
} }
static MP_DEFINE_CONST_FUN_OBJ_1(fdfile_close_obj, fdfile_close); static MP_DEFINE_CONST_FUN_OBJ_1(fdfile_close_obj, fdfile_close);
static mp_obj_t fdfile_fileno(mp_obj_t self_in) {
mp_obj_fdfile_t *self = self_in;
return MP_OBJ_NEW_SMALL_INT(self->fd);
}
static MP_DEFINE_CONST_FUN_OBJ_1(fdfile_fileno_obj, fdfile_fileno);
static mp_obj_fdfile_t *fdfile_new(int fd) { static mp_obj_fdfile_t *fdfile_new(int fd) {
mp_obj_fdfile_t *o = m_new_obj(mp_obj_fdfile_t); mp_obj_fdfile_t *o = m_new_obj(mp_obj_fdfile_t);
o->base.type = &rawfile_type; o->base.type = &rawfile_type;
...@@ -99,6 +105,7 @@ static mp_obj_t fdfile_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const ...@@ -99,6 +105,7 @@ static mp_obj_t fdfile_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const
} }
static const mp_method_t rawfile_type_methods[] = { static const mp_method_t rawfile_type_methods[] = {
{ "fileno", &fdfile_fileno_obj },
{ "read", &mp_stream_read_obj }, { "read", &mp_stream_read_obj },
{ "readall", &mp_stream_readall_obj }, { "readall", &mp_stream_readall_obj },
{ "readline", &mp_stream_unbuffered_readline_obj}, { "readline", &mp_stream_unbuffered_readline_obj},
......
...@@ -84,6 +84,12 @@ static mp_obj_t socket_close(mp_obj_t self_in) { ...@@ -84,6 +84,12 @@ static mp_obj_t socket_close(mp_obj_t self_in) {
} }
static MP_DEFINE_CONST_FUN_OBJ_1(socket_close_obj, socket_close); static MP_DEFINE_CONST_FUN_OBJ_1(socket_close_obj, socket_close);
static mp_obj_t socket_fileno(mp_obj_t self_in) {
mp_obj_socket_t *self = self_in;
return MP_OBJ_NEW_SMALL_INT(self->fd);
}
static MP_DEFINE_CONST_FUN_OBJ_1(socket_fileno_obj, socket_fileno);
static mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) { static mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
mp_obj_socket_t *self = self_in; mp_obj_socket_t *self = self_in;
buffer_info_t bufinfo; buffer_info_t bufinfo;
...@@ -209,6 +215,7 @@ static mp_obj_t socket_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const ...@@ -209,6 +215,7 @@ static mp_obj_t socket_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const
} }
static const mp_method_t microsocket_type_methods[] = { static const mp_method_t microsocket_type_methods[] = {
{ "fileno", &socket_fileno_obj },
{ "read", &mp_stream_read_obj }, { "read", &mp_stream_read_obj },
{ "readall", &mp_stream_readall_obj }, { "readall", &mp_stream_readall_obj },
{ "readline", &mp_stream_unbuffered_readline_obj}, { "readline", &mp_stream_unbuffered_readline_obj},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment