moduzlib: Integrate into the system.

py/builtin.h

@@ -89,5 +89,6 @@ extern struct _dummy_t mp_sys_stderr_obj;
 // extmod modules
 extern const mp_obj_module_t mp_module_uctypes;
 extern const mp_obj_module_t mp_module_zlibd;
+extern const mp_obj_module_t mp_module_uzlib;
 extern const mp_obj_module_t mp_module_ujson;
 extern const mp_obj_module_t mp_module_ure;

py/builtintables.c

@@ -206,6 +206,9 @@ STATIC const mp_map_elem_t mp_builtin_module_table[] = {
 #if MICROPY_PY_ZLIBD
     { MP_OBJ_NEW_QSTR(MP_QSTR_zlibd), (mp_obj_t)&mp_module_zlibd },
 #endif
+#if MICROPY_PY_UZLIB
+    { MP_OBJ_NEW_QSTR(MP_QSTR_uzlib), (mp_obj_t)&mp_module_uzlib },
+#endif
 #if MICROPY_PY_UJSON
     { MP_OBJ_NEW_QSTR(MP_QSTR_ujson), (mp_obj_t)&mp_module_ujson },
 #endif

py/mpconfig.h

@@ -390,6 +390,10 @@ typedef double mp_float_t;
 #define MICROPY_PY_ZLIBD (0)
 #endif
 
+#ifndef MICROPY_PY_UZLIB
+#define MICROPY_PY_UZLIB (0)
+#endif
+
 #ifndef MICROPY_PY_UJSON
 #define MICROPY_PY_UJSON (0)
 #endif

py/py.mk

@@ -114,6 +114,7 @@ PY_O_BASENAME = \
 	../extmod/modzlibd.o \
 	../extmod/modujson.o \
 	../extmod/modure.o \
+	../extmod/moduzlib.o \
 
 # prepend the build destination prefix to the py object files
 PY_O = $(addprefix $(PY_BUILD)/, $(PY_O_BASENAME))

py/qstrdefs.h

@@ -468,6 +468,11 @@ Q(zlibd)
 Q(decompress)
 #endif
 
+#if MICROPY_PY_UZLIB
+Q(uzlib)
+Q(decompress)
+#endif
+
 #if MICROPY_PY_UJSON
 Q(ujson)
 Q(dumps)

tests/extmod/zlibd_decompress.py

@@ -1,7 +1,7 @@
 try:
     import zlib
 except ImportError:
-    import zlibd as zlib
+    import uzlib as zlib
 
 PATTERNS = [
     # Packed results produced by CPy's zlib.compress()

unix/mpconfigport.h

@@ -55,7 +55,7 @@
 #define MICROPY_PY_GC_COLLECT_RETVAL (1)
 
 #define MICROPY_PY_UCTYPES          (1)
-#define MICROPY_PY_ZLIBD            (1)
+#define MICROPY_PY_UZLIB            (1)
 #define MICROPY_PY_UJSON            (1)
 #define MICROPY_PY_URE              (1)