extmod/modtimeq: Remove timeq module.

jimmo · jimmo · commit a1fbb1980cf9 · 2023-06-08T17:54:28.000+10:00
This is a MicroPython-specific module that existed to support the old
version of uasyncio.  It's undocumented and not enabled on all ports and
takes up code size unnecessarily.

Signed-off-by: Jim Mussared &lt;jim.mussared@gmail.com&gt;
diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
@@ -34,7 +34,6 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/modssl_axtls.c
     ${MICROPY_EXTMOD_DIR}/modssl_mbedtls.c
     ${MICROPY_EXTMOD_DIR}/modtime.c
-    ${MICROPY_EXTMOD_DIR}/modtimeq.c
     ${MICROPY_EXTMOD_DIR}/modwebsocket.c
     ${MICROPY_EXTMOD_DIR}/modzlib.c
     ${MICROPY_EXTMOD_DIR}/modwebrepl.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
@@ -31,7 +31,6 @@ SRC_EXTMOD_C += \
 	extmod/modssl_axtls.c \
 	extmod/modssl_mbedtls.c \
 	extmod/modtime.c \
-	extmod/modtimeq.c \
 	extmod/moduasyncio.c \
 	extmod/moductypes.c \
 	extmod/modwebrepl.c \
diff --git a/extmod/modtimeq.c b/extmod/modtimeq.c
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
@@ -83,7 +83,6 @@
 #define MICROPY_BLUETOOTH_NIMBLE            (1)
 #define MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY (1)
 #endif
-#define MICROPY_PY_TIMEQ                    (1)
 #define MICROPY_PY_HASHLIB_SHA1             (1)
 #define MICROPY_PY_HASHLIB_SHA256           (1)
 #define MICROPY_PY_CRYPTOLIB                (1)
diff --git a/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h
@@ -11,7 +11,6 @@
 #define MICROPY_PY_GENERATOR_PEND_THROW (0)
 #define MICROPY_PY_MATH             (0)
 #define MICROPY_PY_HEAPQ            (0)
-#define MICROPY_PY_TIMEQ            (0)
 #define MICROPY_PY_THREAD           (0)
 
 // peripheral config
diff --git a/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h
@@ -11,7 +11,6 @@
 #define MICROPY_PY_GENERATOR_PEND_THROW (1)
 #define MICROPY_PY_MATH             (1)
 #define MICROPY_PY_HEAPQ            (1)
-#define MICROPY_PY_TIMEQ            (1)
 #define MICROPY_PY_THREAD           (0) // disable ARM_THUMB_FP using vldr due to RA has single float only
 
 // peripheral config
diff --git a/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h
@@ -11,7 +11,6 @@
 #define MICROPY_PY_GENERATOR_PEND_THROW (1)
 #define MICROPY_PY_MATH             (1)
 #define MICROPY_PY_HEAPQ            (1)
-#define MICROPY_PY_TIMEQ            (1)
 #define MICROPY_PY_THREAD           (0) // disable ARM_THUMB_FP using vldr due to RA has single float only
 
 // peripheral config
diff --git a/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h
@@ -11,7 +11,6 @@
 #define MICROPY_PY_GENERATOR_PEND_THROW (1)
 #define MICROPY_PY_MATH             (1)
 #define MICROPY_PY_HEAPQ            (1)
-#define MICROPY_PY_TIMEQ            (1)
 #define MICROPY_PY_THREAD           (0) // disable ARM_THUMB_FP using vldr due to RA has single float only
 
 // peripheral config
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h
@@ -11,7 +11,6 @@
 #define MICROPY_PY_GENERATOR_PEND_THROW (0)
 #define MICROPY_PY_MATH             (0)
 #define MICROPY_PY_HEAPQ            (0)
-#define MICROPY_PY_TIMEQ            (0)
 #define MICROPY_PY_THREAD           (0)
 
 // peripheral config
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
@@ -102,9 +102,6 @@
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS (1)
 #define MICROPY_PY_TIME_INCLUDEFILE "ports/renesas-ra/modtime.c"
-#ifndef MICROPY_PY_TIMEQ
-#define MICROPY_PY_TIMEQ            (1)
-#endif
 #ifndef MICROPY_PY_MACHINE
 #define MICROPY_PY_MACHINE          (1)
 #ifndef MICROPY_PY_MACHINE_BITSTREAM
diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
@@ -18,7 +18,6 @@
 #define MICROPY_PY_STM              (0)
 #define MICROPY_PY_PYB_LEGACY       (0)
 #define MICROPY_PY_HEAPQ            (0)
-#define MICROPY_PY_TIMEQ            (0)
 
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
 #define MICROPY_HW_ENABLE_RTC       (1)
diff --git a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
@@ -10,7 +10,6 @@
 #define MICROPY_PY_STM              (0)
 #define MICROPY_PY_PYB_LEGACY       (0)
 #define MICROPY_PY_HEAPQ            (0)
-#define MICROPY_PY_TIMEQ            (0)
 #define MICROPY_PY_FRAMEBUF         (0)
 
 #define MICROPY_HW_ENABLE_RTC       (1)
diff --git a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
@@ -18,7 +18,6 @@
 #define MICROPY_PY_STM              (0)
 #define MICROPY_PY_PYB_LEGACY       (0)
 #define MICROPY_PY_HEAPQ            (0)
-#define MICROPY_PY_TIMEQ            (0)
 
 #define MICROPY_PY_MACHINE_BITSTREAM (0)
 
diff --git a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
@@ -12,7 +12,6 @@
 #define MICROPY_PY_STM              (0)
 #define MICROPY_PY_PYB_LEGACY       (0)
 #define MICROPY_PY_HEAPQ            (0)
-#define MICROPY_PY_TIMEQ            (0)
 
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_ADC       (1)
diff --git a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
@@ -17,7 +17,6 @@
 #define MICROPY_PY_STM                          (0)
 #define MICROPY_PY_PYB_LEGACY                   (0)
 #define MICROPY_PY_HEAPQ                        (0)
-#define MICROPY_PY_TIMEQ                        (0)
 
 #define MICROPY_HW_HAS_FLASH                    (1)
 #define MICROPY_HW_ENABLE_RTC                   (1)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
@@ -108,9 +108,6 @@
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS (1)
 #define MICROPY_PY_TIME_INCLUDEFILE "ports/stm32/modtime.c"
-#ifndef MICROPY_PY_TIMEQ
-#define MICROPY_PY_TIMEQ            (1)
-#endif
 #define MICROPY_PY_LWIP_SOCK_RAW    (MICROPY_PY_LWIP)
 #ifndef MICROPY_PY_MACHINE
 #define MICROPY_PY_MACHINE          (1)
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
@@ -364,7 +364,7 @@ STATIC mp_obj_t extra_coverage(void) {
         mp_repl_autocomplete("import ", 7,  &mp_plat_print, &str); // expect the list of builtins
         len = mp_repl_autocomplete("import ti", 9,  &mp_plat_print, &str); // expect "me"
         mp_printf(&mp_plat_print, "%.*s\n", (int)len, str);
-        mp_repl_autocomplete("import time", 11,  &mp_plat_print, &str); // expect "time timeq"
+        mp_repl_autocomplete("import m", 8,  &mp_plat_print, &str); // expect "micropython machine math"
 
         mp_store_global(MP_QSTR_sys, mp_import_name(MP_QSTR_sys, mp_const_none, MP_OBJ_NEW_SMALL_INT(0)));
         mp_repl_autocomplete("sys.", 4, &mp_plat_print, &str); // expect dir(sys)
diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h
@@ -100,9 +100,6 @@
 #define MICROPY_PY_TIME_CUSTOM_SLEEP   (1)
 #define MICROPY_PY_TIME_INCLUDEFILE    "ports/unix/modtime.c"
 
-// Enable the utimeq module used by the previous (v2) version of uasyncio.
-#define MICROPY_PY_TIMEQ               (1)
-
 #if MICROPY_PY_SSL
 #define MICROPY_PY_HASHLIB_MD5         (1)
 #define MICROPY_PY_HASHLIB_SHA1        (1)
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
@@ -148,7 +148,6 @@
 #define MICROPY_PY_JSON             (1)
 #define MICROPY_PY_RE               (1)
 #define MICROPY_PY_HEAPQ            (1)
-#define MICROPY_PY_TIMEQ            (1)
 #define MICROPY_PY_HASHLIB          (1)
 #define MICROPY_PY_BINASCII         (1)
 #define MICROPY_PY_BINASCII_CRC32   (1)
diff --git a/ports/windows/msvc/sources.props b/ports/windows/msvc/sources.props
@@ -18,7 +18,6 @@
     <PyExtModSource Include="$(PyBaseDir)extmod\modre.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modselect.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modtime.c" />
-    <PyExtModSource Include="$(PyBaseDir)extmod\modtimeq.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modzlib.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\virtpin.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\vfs.c" />
diff --git a/py/mpconfig.h b/py/mpconfig.h
diff --git a/tests/extmod/timeq1.py b/tests/extmod/timeq1.py
diff --git a/tests/extmod/timeq1.py.exp b/tests/extmod/timeq1.py.exp
diff --git a/tests/extmod/timeq_stable.py b/tests/extmod/timeq_stable.py
diff --git a/tests/extmod/timeq_stable.py.exp b/tests/extmod/timeq_stable.py.exp
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
diff --git a/tools/tinytest-codegen.py b/tools/tinytest-codegen.py
