commit 34162872b1119df31288dadc9fda2390119d4e27
author Paul Sokolovsky <pfalcon@users.sourceforge.net> Sun Oct 12 08:16:34 2014 -0700
committer Paul Sokolovsky <pfalcon@users.sourceforge.net> Mon Oct 13 00:07:44 2014 +0300
tree a1f77ac1818e2c8dec2895acefdca1712e2a864f
parent 426bb58b237a2d5ec2cf0e8a36a5b47000e324b1

moduzlib: Integrate into the system.

py/builtin.h

diff --git a/py/builtin.h b/py/builtin.h
index 526157f..5a68609 100644
--- a/py/builtin.h
+++ b/py/builtin.h
@@ -89,5 +89,6 @@
 // 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

diff --git a/py/builtintables.c b/py/builtintables.c
index 1fd60d8..5a7a303 100644
--- a/py/builtintables.c
+++ b/py/builtintables.c
@@ -206,6 +206,9 @@
 #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

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 92b61d0..fa5f682 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -390,6 +390,10 @@
 #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

diff --git a/py/py.mk b/py/py.mk
index e74d557..9e5d918 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -114,6 +114,7 @@
 	../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

diff --git a/py/qstrdefs.h b/py/qstrdefs.h
index eb99e1b..a67cd92 100644
--- a/py/qstrdefs.h
+++ b/py/qstrdefs.h
@@ -468,6 +468,11 @@
 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

diff --git a/tests/extmod/zlibd_decompress.py b/tests/extmod/zlibd_decompress.py
index db96108..64df6da 100644
--- a/tests/extmod/zlibd_decompress.py
+++ b/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

diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h
index bbd100d..f188d5f 100644
--- a/unix/mpconfigport.h
+++ b/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)