diff options
| author | Yonatan Goldschmidt <yon.goldschmidt@gmail.com> | 2019-02-10 22:35:18 +0200 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2019-02-14 00:35:45 +1100 |
| commit | bc4f8b438b56cf1b4f6b44febcd0d83599cbbd68 (patch) | |
| tree | 48a549df981c2471d12cdbe9f135f90b37cf9878 /py | |
| parent | d1acca3c71780545e067e85b444b495cc9801b2b (diff) | |
extmod/moduwebsocket: Refactor `websocket` to `uwebsocket`.
As mentioned in #4450, `websocket` was experimental with a single intended
user, `webrepl`. Therefore, we'll make this change without a weak
link `websocket` -> `uwebsocket`.
Diffstat (limited to 'py')
| -rw-r--r-- | py/builtin.h | 2 | ||||
| -rw-r--r-- | py/mpconfig.h | 4 | ||||
| -rw-r--r-- | py/objmodule.c | 4 | ||||
| -rw-r--r-- | py/py.mk | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/py/builtin.h b/py/builtin.h index 2066c0617..a5e0f5f2d 100644 --- a/py/builtin.h +++ b/py/builtin.h @@ -118,7 +118,7 @@ extern const mp_obj_module_t mp_module_ussl; extern const mp_obj_module_t mp_module_utimeq; extern const mp_obj_module_t mp_module_machine; extern const mp_obj_module_t mp_module_lwip; -extern const mp_obj_module_t mp_module_websocket; +extern const mp_obj_module_t mp_module_uwebsocket; extern const mp_obj_module_t mp_module_webrepl; extern const mp_obj_module_t mp_module_framebuf; extern const mp_obj_module_t mp_module_btree; diff --git a/py/mpconfig.h b/py/mpconfig.h index 95abacafd..47638fb0a 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -1316,8 +1316,8 @@ typedef double mp_float_t; #define MICROPY_PY_USSL_FINALISER (0) #endif -#ifndef MICROPY_PY_WEBSOCKET -#define MICROPY_PY_WEBSOCKET (0) +#ifndef MICROPY_PY_UWEBSOCKET +#define MICROPY_PY_UWEBSOCKET (0) #endif #ifndef MICROPY_PY_FRAMEBUF diff --git a/py/objmodule.c b/py/objmodule.c index 3a00b7ddc..9ba617707 100644 --- a/py/objmodule.c +++ b/py/objmodule.c @@ -211,8 +211,8 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = { #if MICROPY_PY_LWIP { MP_ROM_QSTR(MP_QSTR_lwip), MP_ROM_PTR(&mp_module_lwip) }, #endif -#if MICROPY_PY_WEBSOCKET - { MP_ROM_QSTR(MP_QSTR_websocket), MP_ROM_PTR(&mp_module_websocket) }, +#if MICROPY_PY_UWEBSOCKET + { MP_ROM_QSTR(MP_QSTR_uwebsocket), MP_ROM_PTR(&mp_module_uwebsocket) }, #endif #if MICROPY_PY_WEBREPL { MP_ROM_QSTR(MP_QSTR__webrepl), MP_ROM_PTR(&mp_module_webrepl) }, @@ -256,7 +256,7 @@ PY_EXTMOD_O_BASENAME = \ extmod/modussl_mbedtls.o \ extmod/modurandom.o \ extmod/moduselect.o \ - extmod/modwebsocket.o \ + extmod/moduwebsocket.o \ extmod/modwebrepl.o \ extmod/modframebuf.o \ extmod/vfs.o \ |