diff options
| author | Yonatan Goldschmidt | 2019-02-10 22:35:18 +0200 |
|---|---|---|
| committer | Damien George | 2019-02-14 00:35:45 +1100 |
| commit | bc4f8b438b56cf1b4f6b44febcd0d83599cbbd68 (patch) | |
| tree | 48a549df981c2471d12cdbe9f135f90b37cf9878 /ports | |
| 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 'ports')
| -rw-r--r-- | ports/esp32/mpconfigport.h | 2 | ||||
| -rw-r--r-- | ports/esp8266/modules/webrepl.py | 4 | ||||
| -rw-r--r-- | ports/esp8266/mpconfigport.h | 2 | ||||
| -rw-r--r-- | ports/unix/mpconfigport.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h index a70f6d318..01b23de05 100644 --- a/ports/esp32/mpconfigport.h +++ b/ports/esp32/mpconfigport.h @@ -146,7 +146,7 @@ #define MICROPY_PY_USSL (1) #define MICROPY_SSL_MBEDTLS (1) #define MICROPY_PY_USSL_FINALISER (1) -#define MICROPY_PY_WEBSOCKET (1) +#define MICROPY_PY_UWEBSOCKET (1) #define MICROPY_PY_WEBREPL (1) #define MICROPY_PY_FRAMEBUF (1) #define MICROPY_PY_USOCKET_EVENTS (MICROPY_PY_WEBREPL) diff --git a/ports/esp8266/modules/webrepl.py b/ports/esp8266/modules/webrepl.py index aa156d148..bbf8bdb32 100644 --- a/ports/esp8266/modules/webrepl.py +++ b/ports/esp8266/modules/webrepl.py @@ -2,7 +2,7 @@ import socket import uos import network -import websocket +import uwebsocket import websocket_helper import _webrepl @@ -40,7 +40,7 @@ def accept_conn(listen_sock): print("\nWebREPL connection from:", remote_addr) client_s = cl websocket_helper.server_handshake(cl) - ws = websocket.websocket(cl, True) + ws = uwebsocket.websocket(cl, True) ws = _webrepl._webrepl(ws) cl.setblocking(False) # notify REPL on socket incoming data diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h index b2a05e679..c6bd4c87d 100644 --- a/ports/esp8266/mpconfigport.h +++ b/ports/esp8266/mpconfigport.h @@ -87,7 +87,7 @@ #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_SPI (1) #define MICROPY_PY_MACHINE_SPI_MAKE_NEW machine_hspi_make_new -#define MICROPY_PY_WEBSOCKET (1) +#define MICROPY_PY_UWEBSOCKET (1) #define MICROPY_PY_WEBREPL (1) #define MICROPY_PY_WEBREPL_DELAY (20) #define MICROPY_PY_FRAMEBUF (1) diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h index d0cc9e396..2614af839 100644 --- a/ports/unix/mpconfigport.h +++ b/ports/unix/mpconfigport.h @@ -136,7 +136,7 @@ #ifndef MICROPY_PY_USELECT_POSIX #define MICROPY_PY_USELECT_POSIX (1) #endif -#define MICROPY_PY_WEBSOCKET (1) +#define MICROPY_PY_UWEBSOCKET (1) #define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MACHINE_PULSE (1) #define MICROPY_MACHINE_MEM_GET_READ_ADDR mod_machine_mem_get_addr |