Merge pull request #10137 from eightycc/issue-9596

Remove CIRCUITPY_8_9_WARNINGS and its usage.

Author: dhalbert

py/circuitpy_mpconfig.h

@@ -19,8 +19,8 @@
 
 // Can be removed once CircuitPython 10 is released.
 // Print warnings or not about deprecated names. See objmodule.c.
-#ifndef CIRCUITPY_8_9_WARNINGS
-#define CIRCUITPY_8_9_WARNINGS (0)
+#ifndef CIRCUITPY_9_10_WARNINGS
+#define CIRCUITPY_9_10_WARNINGS (1)
 #endif
 
 // REPR_C encodes qstrs, 31-bit ints, and 30-bit floats in a single 32-bit word.

py/objmodule.c

@@ -68,7 +68,7 @@ static void module_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     mp_obj_module_t *self = MP_OBJ_TO_PTR(self_in);
     if (dest[0] == MP_OBJ_NULL) {
         // CIRCUITPY-CHANGE
-        #if CIRCUITPY_8_9_WARNINGS && CIRCUITPY_DISPLAYIO && CIRCUITPY_WARNINGS
+        #if CIRCUITPY_9_10_WARNINGS && CIRCUITPY_DISPLAYIO && CIRCUITPY_WARNINGS
         if (self == &displayio_module) {
             #if CIRCUITPY_BUSDISPLAY
             if (attr == MP_QSTR_Display) {