summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2017-06-14 17:40:02 +1000
committerDamien George <damien.p.george@gmail.com>2017-06-14 17:40:02 +1000
commit696fcde8009b3670e5c4e867600c17a916f9a3b0 (patch)
treea0dec2c87c638a6bcad4f6276b040fde224e301c
parent3bedff0b3cbb5ae9bc499f8ec0108c54f26fc87c (diff)
downloadmicropython-696fcde8009b3670e5c4e867600c17a916f9a3b0.tar.gz
micropython-696fcde8009b3670e5c4e867600c17a916f9a3b0.zip
cc3200/modusocket: Simplify socket.makefile() function.
Following how extmod/modlwip.c does it.
-rw-r--r--cc3200/mods/modusocket.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/cc3200/mods/modusocket.c b/cc3200/mods/modusocket.c
index ca28bf7ba9..40a53b404c 100644
--- a/cc3200/mods/modusocket.c
+++ b/cc3200/mods/modusocket.c
@@ -643,17 +643,8 @@ STATIC mp_obj_t socket_setblocking(mp_obj_t self_in, mp_obj_t blocking) {
STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_setblocking_obj, socket_setblocking);
STATIC mp_obj_t socket_makefile(mp_uint_t n_args, const mp_obj_t *args) {
- // TODO: CPython explicitly says that closing the returned object doesn't
- // close the original socket (Python2 at all says that fd is dup()ed). But
- // we save on the bloat.
- mod_network_socket_obj_t *self = args[0];
- if (n_args > 1) {
- const char *mode = mp_obj_str_get_str(args[1]);
- if (strcmp(mode, "rb") && strcmp(mode, "wb")) {
- mp_raise_ValueError(mpexception_value_invalid_arguments);
- }
- }
- return self;
+ (void)n_args;
+ return args[0];
}
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_makefile_obj, 1, 6, socket_makefile);