From 75efb3267c7ec54f7131906d6ab1a3ab5185a185 Mon Sep 17 00:00:00 2001 From: Jim Mussared Date: Fri, 20 May 2022 20:38:23 +1000 Subject: [PATCH] extmod: Revert accidental usocket->socket rename. The registration of the usocket module was accidentally changed to socket in moving to MP_REGISTER_MODULE in bb794f05b7fef75696118ea1eb03a769a9fac40d --- extmod/modlwip.c | 2 +- extmod/modusocket.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extmod/modlwip.c b/extmod/modlwip.c index e20ade139b..47d5bcdbb9 100644 --- a/extmod/modlwip.c +++ b/extmod/modlwip.c @@ -1781,6 +1781,6 @@ const mp_obj_module_t mp_module_lwip = { MP_REGISTER_MODULE(MP_QSTR_lwip, mp_module_lwip, MICROPY_PY_LWIP); // On LWIP-ports, this is the usocket module (replaces extmod/modusocket.c). -MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_lwip, MICROPY_PY_LWIP); +MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_lwip, MICROPY_PY_LWIP); #endif // MICROPY_PY_LWIP diff --git a/extmod/modusocket.c b/extmod/modusocket.c index c4bf6342a4..5f07d4f789 100644 --- a/extmod/modusocket.c +++ b/extmod/modusocket.c @@ -588,6 +588,6 @@ const mp_obj_module_t mp_module_usocket = { .globals = (mp_obj_dict_t *)&mp_module_usocket_globals, }; -MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_usocket, MICROPY_PY_NETWORK && MICROPY_PY_USOCKET && !MICROPY_PY_LWIP); +MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket, MICROPY_PY_NETWORK && MICROPY_PY_USOCKET && !MICROPY_PY_LWIP); #endif // MICROPY_PY_NETWORK && MICROPY_PY_USOCKET && !MICROPY_PY_LWIP